[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Bacula-devel] Version reporting patch for ctest



After last night's run, I found a glitch in the way that Bacula includes the version number of a build in the BuildName parameter of a ctest run.

Assume that the local copy of Bacula source is version A, and the latest in the repository is version B. When ctest first runs the update and build, it will show up with a version of A, since that's the version it started with. After that, though, the version will get updated, and get reported with version B.

The end result is that it appears that there are two test runs in the database, one of just an update and configure for version A, and one of just a test for version B, when there should be one run of B.

The attached patch fixes it by splitting out the ctest stages in the nightly-* scripts, and modifying the update XML file in-place to reflect the desired BuildName.

--
Frank Sweetser fs at wpi.edu  |  For every problem, there is a solution that
WPI Senior Network Engineer   |  is simple, elegant, and wrong. - HL Mencken
    GPG fingerprint = 6174 1257 129E 0D21 D8D4  E8A3 8E39 29E3 E2E8 8CEC
Index: scripts/fixup-update-version
===================================================================
--- scripts/fixup-update-version	(revision 0)
+++ scripts/fixup-update-version	(revision 0)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+tag=`head -1 Testing/TAG`
+bname=`grep BuildName DartConfiguration.tcl | awk '{print $2}'`
+
+sed -i Testing/${tag}/Update.xml -e "s,<BuildName>[^<]*</BuildName>,<BuildName>${bname}</BuildName>,"

Property changes on: scripts/fixup-update-version
___________________________________________________________________
Name: svn:executable
   + *

Index: nightly-all
===================================================================
--- nightly-all	(revision 6531)
+++ nightly-all	(working copy)
@@ -6,6 +6,13 @@
 save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
+rm -rf Testing
 scripts/config_dart
-ctest -D Nightly -R "all-non-root.*"
+ctest -D NightlyUpdate -R "all-non-root.*"
+scripts/config_dart
+scripts/fixup-update-version
+ctest -D NightlyConfigure -R "all-non-root.*"
+ctest -D NightlyBuild -R "all-non-root.*"
+ctest -D NightlyTest -R "all-non-root.*"
+ctest -D NightlySubmit -R "all-non-root.*"
 REGRESS_DEBUG=${save_debug}
Index: nightly-disk
===================================================================
--- nightly-disk	(revision 6531)
+++ nightly-disk	(working copy)
@@ -6,6 +6,13 @@
 save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
+rm -rf Testing
 scripts/config_dart
-ctest -D Nightly -R "all-non-root:"
+ctest -D NightlyUpdate -R "all-non-root:"
+scripts/config_dart
+scripts/fixup-update-version
+ctest -D NightlyConfigure -R "all-non-root:"
+ctest -D NightlyBuild -R "all-non-root:"
+ctest -D NightlyTest -R "all-non-root:"
+ctest -D NightlySubmit -R "all-non-root:"
 REGRESS_DEBUG=${save_debug}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bacula-devel mailing list
Bacula-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/bacula-devel


This mailing list archive is a service of Copilotco.