Save any dumps during regression to dumps directory

diff --git a/regress/Makefile b/regress/Makefile
index 983b0147d24e171160d829bbbebf76fce1fa931c..716893ffea9dc1d80baa1277449903b11b602de8 100644 (file)
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -26,8 +26,8 @@ bacula: all
        @-gunzip w.tar.gz
        @-tar xf w.tar
        @rm -f w.tar.gz w.tar
-       @rm -rf tmp working
-       mkdir tmp working
+       @rm -rf tmp working dumps
+       mkdir tmp working dumps
        echo "Doing: scripts/setup"
        scripts/setup
 
@@ -50,7 +50,7 @@ root_test:
 clean:
        scripts/cleanup
        rm -f tmp/file-list
-       rm -fr tmp/* working/* Testing
+       rm -fr tmp/* working/* dumps/* Testing
        rm -f test.out
        rm -f diff
        rm -f 1 2 3 scripts/1 scripts/2 scripts/3 tests/1 tests/2 tests/3

diff --git a/regress/all-changer-tests b/regress/all-changer-tests
index 88c0a7b9af9f219e9adf1d75692c10b1c3744144..65dc26e4dbb3a845f47bb4722e362481434396ca 100755 (executable)
--- a/regress/all-changer-tests
+++ b/regress/all-changer-tests
@@ -4,6 +4,7 @@
 #
 echo "Start autochanger tests"
 echo "Start autochanger tests" >>test.out
+rm -f dumps/*
 
 nice tests/incremental-changer
 nice tests/two-pool-changer

diff --git a/regress/all-dev-tests b/regress/all-dev-tests
index e7888bce946437c2024a9fe8a248ea22ae4606e0..7cded2fe7ff73d5f9871f2f7eebceb9e939340b9 100755 (executable)
--- a/regress/all-dev-tests
+++ b/regress/all-dev-tests
@@ -7,6 +7,7 @@ echo " "
 echo " " >>test.out
 echo "Start sample non-root disk tests"
 echo "Start sample non-root disk tests" >>test.out
+rm -f dumps/*
 nice tests/acl-xattr-test
 nice tests/action-on-purge-test
 nice tests/allowcompress-test

diff --git a/regress/all-disk-tests b/regress/all-disk-tests
index edd7f0ae50abcb19efff196d1aeed10a5200d229..468466ab25dd7f32ecfda59ea4ab3dcba39beb88 100755 (executable)
--- a/regress/all-disk-tests
+++ b/regress/all-disk-tests
@@ -6,6 +6,7 @@ echo " "
 echo " " >>test.out
 echo "Start non-root disk tests"
 echo "Start non-root disk tests" >>test.out
+rm -f dumps/*
 nice tests/acl-xattr-test
 nice tests/action-on-purge-test
 nice tests/allowcompress-test

diff --git a/regress/all-root-tests b/regress/all-root-tests
index 1ba54d9f4a1a6cce64997b75e53e62d55a0d758f..284f4e47038333cc008af6aebc6d4051d2518818 100755 (executable)
--- a/regress/all-root-tests
+++ b/regress/all-root-tests
@@ -6,6 +6,7 @@ echo " "
 echo " " >>test.out
 echo "Start root tests"
 echo "Start root tests" >>test.out
+rm -f dumps/*
 tests/dev-test-root
 tests/etc-test-root
 tests/lib-test-root

diff --git a/regress/all-tape-and-disk-tests b/regress/all-tape-and-disk-tests
index 9bc3e7676c77210026dae379c0ad5a8ade274510..3d0e99d8b4817ef57c67b4ee88bbbbad62158389 100755 (executable)
--- a/regress/all-tape-and-disk-tests
+++ b/regress/all-tape-and-disk-tests
@@ -2,5 +2,6 @@
 #
 # Run all tests
 #
+rm -f dumps/*
 ./all-non-root-tests
 ./all-non-root-tape-tests

diff --git a/regress/all-tape-tests b/regress/all-tape-tests
index aee2a5248f6e6b29abc55ddddb045d90c7dc52de..a99ad9234859f0fae52e62e41645be119d390992 100755 (executable)
--- a/regress/all-tape-tests
+++ b/regress/all-tape-tests
@@ -16,6 +16,7 @@ echo " "
 echo " " >>test.out
 echo "Start all non-root tape tests"
 echo "Start all non-root tape tests" >>test.out
+rm -f dumps/*
 nice tests/ansi-label-tape
 nice tests/backup-bacula-tape
 nice tests/bscan-tape

diff --git a/regress/all-tests b/regress/all-tests
index e3dc688c8769083dabf3cf238034f12d498d045f..d54eb22489cc475ee89903b6607f1770685343bf 100755 (executable)
--- a/regress/all-tests
+++ b/regress/all-tests
@@ -2,5 +2,6 @@
 #
 # Run all tests
 #
+rm -f dumps/*
 ./all-non-root-tests
 ./all-root-tests

diff --git a/regress/experimental-all b/regress/experimental-all
index df73917bf4a4eec80a3913d0f552fa567d9c4aad..bf4a41dbc33289acd537f414c0dbdce26429bf7e 100755 (executable)
--- a/regress/experimental-all
+++ b/regress/experimental-all
@@ -9,6 +9,7 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
+rm -f dumps/*
 git pull
 scripts/config_dart
 nice ctest -D Experimental -R "^(disk|tape|changer):"

diff --git a/regress/experimental-disk b/regress/experimental-disk
index a965df924255ad8fdbe2a69a8b8e66be1e33a5ac..39476df9dea4733f6536d97fb893871075094b51 100755 (executable)
--- a/regress/experimental-disk
+++ b/regress/experimental-disk
@@ -9,6 +9,7 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
+rm -f dumps/*
 git pull
 scripts/config_dart
 make setup

diff --git a/regress/experimental-disk-and-tape b/regress/experimental-disk-and-tape
index 442370ded8ff0efa6d72c93739677e5b04f785b8..b1bd2a0f77093fea460180135bcc1d532754b750 100755 (executable)
--- a/regress/experimental-disk-and-tape
+++ b/regress/experimental-disk-and-tape
@@ -9,6 +9,7 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
+rm -f dumps/*
 git pull
 scripts/config_dart
 nice ctest -D Experimental -R "^(disk|tape):"

diff --git a/regress/experimental-tape b/regress/experimental-tape
index fecd7d86de92696bc4540cc9f476922d2ff6600d..c12edf4d7ee3686d797fcfd15053892f473fa1bc 100755 (executable)
--- a/regress/experimental-tape
+++ b/regress/experimental-tape
@@ -9,6 +9,7 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
+rm -f dumps/*
 git pull
 scripts/config_dart
 nice ctest -D Experimental -R "^tape:"

diff --git a/regress/nightly-all b/regress/nightly-all
index 7f817952a8e959fdef9db59f565544e6dfa02f74..28651ec3e589e38dff773fcf7096cc4f62329a87 100755 (executable)
--- a/regress/nightly-all
+++ b/regress/nightly-all
@@ -9,6 +9,7 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
+rm -f dumps/*
 git pull
 make distclean
 scripts/config_dart

diff --git a/regress/nightly-disk b/regress/nightly-disk
index 6f199012a724e425fd4706b844afe6e757223ad8..d4f8045de2c2aacc65429b289fe671aedd947e3c 100755 (executable)
--- a/regress/nightly-disk
+++ b/regress/nightly-disk
@@ -9,15 +9,16 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
+rm -f dumps/*
 git pull
 #
 # Temp switch to branch Branch-5.0 NB this leaves you on a headless
 #    branch, but it works for building and testing.
 #
-git checkout `git branch -r | grep "5\.0" | head -1`
-if [ $? -ne 0 ]; then
-   git checkout master
-fi
+#git checkout `git branch -r | grep "5\.0" | head -1`
+#if [ $? -ne 0 ]; then
+#   git checkout master
+#fi
 make distclean
 scripts/config_dart
 make setup

diff --git a/regress/nightly-disk-and-tape b/regress/nightly-disk-and-tape
index f32bea52173cb26865ee26a27a7a287c12cdd33d..9a96c6185a40d83a452686d5e7387484f24de2e5 100755 (executable)
--- a/regress/nightly-disk-and-tape
+++ b/regress/nightly-disk-and-tape
@@ -9,6 +9,7 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
+rm -f dumps/*
 git pull
 make distclean
 scripts/config_dart

diff --git a/regress/nightly-tape b/regress/nightly-tape
index e4d35171811afb1f87a0865f9ed691d35dc349c7..d8a1890a2e4af7eefd196c2a931fcdd9697baa76 100755 (executable)
--- a/regress/nightly-tape
+++ b/regress/nightly-tape
@@ -9,6 +9,7 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
+rm -f dumps/*
 git pull
 make distclean
 scripts/config_dart

diff --git a/regress/scripts/functions b/regress/scripts/functions
index aaaac42d87dda644f13a966e65601087c2e97427..6e9e751b595f7a8d10790dc52dc48b801f180a7f 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -320,9 +320,15 @@ check_restore_tmp_build_diff()
 #
 end_test()
 {
-   cat ${working}/bacula.*.traceback 2>/dev/null
-   cat ${working}/*.bactrace 2>/dev/null
-   echo -e $print_error
+   if [ x$notracedump != xyes ]; then 
+      cat ${working}/bacula.*.traceback 2>/dev/null
+      cp -f  ${working}/bacula.*.traceback ${dumps} 2>/dev/null
+      cat ${working}/*.bactrace 2>/dev/null
+      cp -f ${working}/*.bactrace ${dumps} 2>/dev/null
+   fi
+   if [ -f $tmp/err.log ]; then
+      cat $tmp/err.log
+   fi
    if [ $estat != 0 ] ; then
       echo " "
       echo "  !!!!! $TestName failed!!! `date +%R:%S` !!!!! "
@@ -495,6 +501,7 @@ db_name=${db_name:-"regress"}
 db_user=${db_user:-"regress"}
 db_password=${db_password:-""}
 working=${working:-"$cwd/working"}
+dumps=${dumps:-"$cwd/dumps"}
 bin=${bin:-"$cwd/bin"}
 
 # Bacula scripts
@@ -518,6 +525,7 @@ tmpsrc=${tmpsrc:-"$cwd/tmp/build"}
 export bin
 export conf
 export working
+export dumps
 export scripts
 export rscripts
 export tmp