Apply patch for regress from Frank Sweester

diff --git a/regress/.gitignore b/regress/.gitignore
new file mode 100644 (file)
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 ca4bd1ff2f3f9e9bf2c25483672317c1ea9722ef..26135b884e1ca97d78c982845388bb32ca8b4eb5 100644 (file)
--- 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 32c8a607715a426978fd50491a66b570bfe1e51e..df73917bf4a4eec80a3913d0f552fa567d9c4aad 100755 (executable)
--- 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 f5e68bb29e0f387ed9f267818983acab85cc55b6..a965df924255ad8fdbe2a69a8b8e66be1e33a5ac 100755 (executable)
--- 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 f83880ef3021cf6d4b76fbf6146b0c7cef14ce30..442370ded8ff0efa6d72c93739677e5b04f785b8 100755 (executable)
--- 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 1addaca6856bfd425e77abae564e9c3d78346b07..fecd7d86de92696bc4540cc9f476922d2ff6600d 100755 (executable)
--- 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 d83d2f103a05aa129cf386ecdaeb9c33c8fed757..7f817952a8e959fdef9db59f565544e6dfa02f74 100755 (executable)
--- 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 fb9a9228a6f9f6268fc193495501bb0777c96bcc..a54163b4609c51f8fe7778bb19066bb9b714679e 100755 (executable)
--- 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 f2ffde2b32a0c60aa9e9ffcd154b079820a7bb32..f32bea52173cb26865ee26a27a7a287c12cdd33d 100755 (executable)
--- 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 d9235d431c8614407749a4fdf827494d2615a975..e4d35171811afb1f87a0865f9ed691d35dc349c7 100755 (executable)
--- 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 264acb7731289040a116a70ea375e430f5eb6abb..e46cbe6e689967c59387dd570b0fa92d07c82e75 100755 (executable)
--- 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 6013db2fcaf0f81c24ecca55c6fa55e6563f18e3..fc8fc8d899bb659be8f90470bf8c4820c0cc1740 100755 (executable)
--- 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 c33db1a6394f5301db16847b310090274f67e989..c5aa72e2b7e06e92a866686e2af3ce16ba985814 100644 (file)
--- 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@