From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 4 Aug 2009 13:57:55 +0000 (+0200)
Subject: Apply patch for regress from Frank Sweester
X-Git-Tag: Release-5.0.0~337^2~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e9d39b039772313e204ebb87633127f63b32cab8;p=bacula%2Fbacula

Apply patch for regress from Frank Sweester
---

diff --git a/regress/.gitignore b/regress/.gitignore
new file mode 100644
index 0000000000..6290a4858d
--- /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 ca4bd1ff2f..26135b884e 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 32c8a60771..df73917bf4 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 f5e68bb29e..a965df9242 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 f83880ef30..442370ded8 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 1addaca685..fecd7d86de 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 d83d2f103a..7f817952a8 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 fb9a9228a6..a54163b460 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 f2ffde2b32..f32bea5217 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 d9235d431c..e4d3517181 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 264acb7731..e46cbe6e68 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 6013db2fca..fc8fc8d899 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 c33db1a639..c5aa72e2b7 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@