|
From: <sv...@va...> - 2011-09-06 17:22:30
|
Author: florian
Date: 2011-09-06 18:17:41 +0100 (Tue, 06 Sep 2011)
New Revision: 12012
Log:
Change get_svn_revision to also work with older subversion releases
that do not allow specifying a revision with svn info.
Modified:
trunk/nightly/bin/nightly
Modified: trunk/nightly/bin/nightly
===================================================================
--- trunk/nightly/bin/nightly 2011-09-06 11:26:31 UTC (rev 12011)
+++ trunk/nightly/bin/nightly 2011-09-06 17:17:41 UTC (rev 12012)
@@ -11,7 +11,11 @@
# Returns the revision number of the source files with date $1.
get_svn_revision() {
- svn info -r "{$1}" "${valgrind_svn_repo}" | sed -n 's/^Revision: //p'
+ (cd $DIR; rm -rf infodir;
+ svn co -r "{$1}" "${valgrind_svn_repo}/nightly" infodir > /dev/null;
+ revno=`svn info infodir | sed -n 's/^Revision: //p'`;
+ rm -rf infodir;
+ echo $revno)
}
runcmd () {
|
|
From: Bart V. A. <bva...@ac...> - 2011-09-07 10:47:22
|
On Tue, Sep 6, 2011 at 7:17 PM, <sv...@va...> wrote:
> Modified: trunk/nightly/bin/nightly
> ===================================================================
> --- trunk/nightly/bin/nightly 2011-09-06 11:26:31 UTC (rev 12011)
> +++ trunk/nightly/bin/nightly 2011-09-06 17:17:41 UTC (rev 12012)
> @@ -11,7 +11,11 @@
>
> # Returns the revision number of the source files with date $1.
> get_svn_revision() {
> - svn info -r "{$1}" "${valgrind_svn_repo}" | sed -n 's/^Revision: //p'
> + (cd $DIR; rm -rf infodir;
> + svn co -r "{$1}" "${valgrind_svn_repo}/nightly" infodir > /dev/null;
> + revno=`svn info infodir | sed -n 's/^Revision: //p'`;
> + rm -rf infodir;
> + echo $revno)
> }
>
> runcmd () {
Hello Florian,
Have you considered to run the "svn co -r ..." alternative only if
"svn info -r ..." fails ? The above change seems somewhat invasive to
me - it changes the number of Valgrind tree checkouts from two to four
per nightly build.
Bart.
|
|
From: Florian K. <br...@ac...> - 2011-09-07 13:03:37
|
On 09/07/2011 06:46 AM, Bart Van Assche wrote:
> On Tue, Sep 6, 2011 at 7:17 PM, <sv...@va...> wrote:
>> Modified: trunk/nightly/bin/nightly
>> ===================================================================
>> --- trunk/nightly/bin/nightly 2011-09-06 11:26:31 UTC (rev 12011)
>> +++ trunk/nightly/bin/nightly 2011-09-06 17:17:41 UTC (rev 12012)
>> @@ -11,7 +11,11 @@
>>
>> # Returns the revision number of the source files with date $1.
>> get_svn_revision() {
>> - svn info -r "{$1}" "${valgrind_svn_repo}" | sed -n 's/^Revision: //p'
>> + (cd $DIR; rm -rf infodir;
>> + svn co -r "{$1}" "${valgrind_svn_repo}/nightly" infodir > /dev/null;
>> + revno=`svn info infodir | sed -n 's/^Revision: //p'`;
>> + rm -rf infodir;
>> + echo $revno)
>> }
>>
>> runcmd () {
>
> Hello Florian,
>
> Have you considered to run the "svn co -r ..." alternative only if
> "svn info -r ..." fails ? The above change seems somewhat invasive to
> me - it changes the number of Valgrind tree checkouts from two to four
> per nightly build.
>
Hi Bart,
I did not consider checking availability of "svn co -r" first.
Note, that I'm not checking out the complete repository just the nightly
subtree, which is quite small. And the runtime difference is not really
significant in the big scheme of things.
Florian
|