On 8/2/2009 1:33 PM, Kern Sibbald wrote:
Hopefully we will get commiting developers online early next week. In
addition to being a somewhat rushed move, this change has broken the normal
nightly regression tests, which must be upgraded to pull from git rather than
the SVN :-(
Well, if the regression suite is broken anyway, this sounds like a perfect
unintended maintenance window for updaing cdash to the latest version =)
More on topic, I've attached a fairly simple patch which seems to do the trick
for me. All it does is 1) add a couple more .gitignore files, and 2) swap out
any svn commands for roughly equivalent git ones.
There is a small loss of functionality, though. In the svn setup, the
dashboard build results could show you the set of changes applied to the code
being tested, relative to the last such build. Now, however, since - at least
in the simple case - both the bacula and regress directories are part of the
same checkout, you don't seem to be able to update the regression code without
simultaneously updating the bacula code. This means that if you want to make
sure you're always running the latest regression suite, and so update the
regress directory first, then ctest will never see any changes.
This is, however, a pretty minor point, probably not worth investing much time
in at this point, since neither ctest nor cdash seem to support git:
http://www.cmake.org/Bug/view.php?id=6994
--
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
>From a9076dc5bef4f0b1c81e9e9a93bbf4c4588ed4ba Mon Sep 17 00:00:00 2001
From: Frank Sweetser <[email protected]>
Date: Mon, 3 Aug 2009 03:29:00 +0200
Subject: [PATCH] First pass at converting regression suite from svn to git
---
.gitignore | 1 +
regress/.gitignore | 24 ++++++++++++++++++++++++
regress/DartConfiguration.tcl.in | 2 +-
regress/experimental-all | 2 +-
regress/experimental-disk | 2 +-
regress/experimental-disk-and-tape | 2 +-
regress/experimental-tape | 2 +-
regress/nightly-all | 2 +-
regress/nightly-disk | 2 +-
regress/nightly-disk-and-tape | 2 +-
regress/nightly-tape | 2 +-
regress/scripts/config_dart | 7 ++++---
regress/scripts/setup | 1 +
regress/scripts/update-ctest.in | 4 ++--
14 files changed, 41 insertions(+), 14 deletions(-)
create mode 100644 .gitignore
create mode 100644 regress/.gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..70427a4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+test.out
diff --git a/regress/.gitignore b/regress/.gitignore
new file mode 100644
index 0000000..6290a48
--- /dev/null
+++ b/regress/.gitignore
@@ -0,0 +1,24 @@
+config
+DartConfiguration.tcl
+DartTestfile.txt
+Testing
+bin
+build
+scripts/*.conf
+test.out
+tmp
+weird-files
+working
+scripts/bacula-dir.conf.accurate
+scripts/bacula-dir.conf.errors
+scripts/bacula-dir.conf.maxruntime
+scripts/bacula-dir.conf.maxtime
+scripts/bacula-dir.conf.regexwhere
+scripts/bacula-dir.conf.testrunscript
+scripts/cleanup-2drive
+scripts/cleanup-2tape
+scripts/cleanup-tape
+scripts/prepare-fake-autochanger
+scripts/prepare-two-tapes
+scripts/regress-config
+scripts/update-ctest
diff --git a/regress/DartConfiguration.tcl.in b/regress/DartConfiguration.tcl.in
index ca4bd1f..26135b8 100644
--- a/regress/DartConfiguration.tcl.in
+++ b/regress/DartConfiguration.tcl.in
@@ -10,5 +10,5 @@ TriggerSite: http://regress.bacula.org
NightlyStartTime: 23:00:00 CET
MakeCommand: @regressdir@/scripts/update-ctest
ConfigureCommand: true
-UpdateCommand: svn
+UpdateCommand: true
TimeOut: 1800
diff --git a/regress/experimental-all b/regress/experimental-all
index 32c8a60..df73917 100755
--- a/regress/experimental-all
+++ b/regress/experimental-all
@@ -9,7 +9,7 @@ save_debug=${REGRESS_DEBUG}
REGRESS_DEBUG=1
export REGRESS_DEBUG
rm -rf Testing
-svn update
+git pull
scripts/config_dart
nice ctest -D Experimental -R "^(disk|tape|changer):"
rtn=$?
diff --git a/regress/experimental-disk b/regress/experimental-disk
index f5e68bb..a965df9 100755
--- a/regress/experimental-disk
+++ b/regress/experimental-disk
@@ -9,7 +9,7 @@ save_debug=${REGRESS_DEBUG}
REGRESS_DEBUG=1
export REGRESS_DEBUG
rm -rf Testing
-svn update
+git pull
scripts/config_dart
make setup
nice ctest -D Experimental -R "^disk:"
diff --git a/regress/experimental-disk-and-tape
b/regress/experimental-disk-and-tape
index f83880e..442370d 100755
--- a/regress/experimental-disk-and-tape
+++ b/regress/experimental-disk-and-tape
@@ -9,7 +9,7 @@ save_debug=${REGRESS_DEBUG}
REGRESS_DEBUG=1
export REGRESS_DEBUG
rm -rf Testing
-svn update
+git pull
scripts/config_dart
nice ctest -D Experimental -R "^(disk|tape):"
rtn=$?
diff --git a/regress/experimental-tape b/regress/experimental-tape
index 1addaca..fecd7d8 100755
--- a/regress/experimental-tape
+++ b/regress/experimental-tape
@@ -9,7 +9,7 @@ save_debug=${REGRESS_DEBUG}
REGRESS_DEBUG=1
export REGRESS_DEBUG
rm -rf Testing
-svn update
+git pull
scripts/config_dart
nice ctest -D Experimental -R "^tape:"
rtn=$?
diff --git a/regress/nightly-all b/regress/nightly-all
index d83d2f1..7f81795 100755
--- a/regress/nightly-all
+++ b/regress/nightly-all
@@ -9,7 +9,7 @@ save_debug=${REGRESS_DEBUG}
REGRESS_DEBUG=1
export REGRESS_DEBUG
rm -rf Testing
-svn update
+git pull
make distclean
scripts/config_dart
nice ctest -D Nightly -R "^(disk|tape|changer):"
diff --git a/regress/nightly-disk b/regress/nightly-disk
index fb9a922..a54163b 100755
--- a/regress/nightly-disk
+++ b/regress/nightly-disk
@@ -9,7 +9,7 @@ save_debug=${REGRESS_DEBUG}
REGRESS_DEBUG=1
export REGRESS_DEBUG
rm -rf Testing
-svn update
+git pull
make distclean
scripts/config_dart
make setup
diff --git a/regress/nightly-disk-and-tape b/regress/nightly-disk-and-tape
index f2ffde2..f32bea5 100755
--- a/regress/nightly-disk-and-tape
+++ b/regress/nightly-disk-and-tape
@@ -9,7 +9,7 @@ save_debug=${REGRESS_DEBUG}
REGRESS_DEBUG=1
export REGRESS_DEBUG
rm -rf Testing
-svn update
+git pull
make distclean
scripts/config_dart
nice ctest -D Experimental -R "^(disk|tape):"
diff --git a/regress/nightly-tape b/regress/nightly-tape
index d9235d4..e4d3517 100755
--- a/regress/nightly-tape
+++ b/regress/nightly-tape
@@ -9,7 +9,7 @@ save_debug=${REGRESS_DEBUG}
REGRESS_DEBUG=1
export REGRESS_DEBUG
rm -rf Testing
-svn update
+git pull
make distclean
scripts/config_dart
nice ctest -D Nightly -R "^tape:"
diff --git a/regress/scripts/config_dart b/regress/scripts/config_dart
index 264acb7..e46cbe6 100755
--- a/regress/scripts/config_dart
+++ b/regress/scripts/config_dart
@@ -9,9 +9,10 @@ mkdir -p ${cwd}/bin
out="${cwd}/tmp/sed_tmp"
# pull in latest Bacula version
-cd ${BACULA_SOURCE}
-svn update src/version.h
-cd ${cwd}
+#cd ${BACULA_SOURCE}
+#svn update src/version.h
+#cd ${cwd}
+git pull
scripts/create_sed
diff --git a/regress/scripts/setup b/regress/scripts/setup
index 6013db2..fc8fc8d 100755
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -25,6 +25,7 @@ rm -rf build bin
# Copy new source
echo "Copying source from ${BACULA_SOURCE}"
cp -rp ${BACULA_SOURCE} build
+git show HEAD | grep -m 1 commit | awk '{print $2}' > build/git-version
scripts/create_sed
# In default bacula-dir.conf.in, change default file
# to backup to be build directory
diff --git a/regress/scripts/update-ctest.in b/regress/scripts/update-ctest.in
index c33db1a..c5aa72e 100644
--- a/regress/scripts/update-ctest.in
+++ b/regress/scripts/update-ctest.in
@@ -11,11 +11,11 @@ fi
cd @regressdir@/build
-cur=`svn info | grep Revision: | awk '{print $2'}`
+cur=`cat git-version`
cd @srcdir@
-new=`svn info | grep Revision: | awk '{print $2'}`
+new=`git show HEAD | grep -m 1 commit | awk '{print $2}'`
cd @regressdir@
--
1.5.4.3
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Bacula-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bacula-devel
