Updates

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2831 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/tests/2drive-incremental-2disk b/regress/tests/2drive-incremental-2disk
index b61bcd970fd01b88660511b4299ccd1eefdd5a29..f3972b0adc01453de5f9eafe382c92247407b9ed 100755 (executable)
--- a/regress/tests/2drive-incremental-2disk
+++ b/regress/tests/2drive-incremental-2disk
@@ -53,7 +53,7 @@ messages
 @$out tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1
-@#setdebug level=100 storage=DDS-4
+setdebug level=100 storage=DDS-4
 run job=NightlySave yes
 run job=NightlySave yes
 run job=NightlySave yes

diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test
index b507d888dc17ae385b5242b17401a016e779e47b..89f368207e38fd4c29d1753bb5a292ddfb1986ed 100755 (executable)
--- a/regress/tests/auto-label-test
+++ b/regress/tests/auto-label-test
@@ -31,7 +31,7 @@ status all
 status all
 list pools
 messages
-@#setdebug level=400 storage=File
+@#setdebug level=110 storage=File
 run job=CompressedTest storage=File yes
 list pools
 list volumes

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 0943efee259dfd8ce1ab866fff103343c1d868f2..cf372872a21ab75075eb827b406077632e9279e7 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -33,13 +33,13 @@ status storage=File
 status storage=File
 status storage=File
 status storage=File
-sleep 1
+@sleep 1
 status storage=File
 status storage=File
 status storage=File
 status storage=File
 status storage=File
-sleep 1
+@sleep 1
 status storage=File
 status storage=File
 status storage=File
@@ -73,7 +73,8 @@ grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
 grep "^  Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
-diff -r build tmp/bacula-restores${cwd}/build 2>&1 >/dev/null
+# diff -r build tmp/bacula-restores${cwd}/build 2>&1 >/dev/null
+diff -r build tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "

diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index b0626da73f6a4fc03824f69f28795eee45639a97..a07b387a2fd563f0f9b6ad07deef701af471313b 100755 (executable)
--- a/regress/tests/bextract-test
+++ b/regress/tests/bextract-test
@@ -55,7 +55,6 @@ fi
 scripts/check_for_zombie_jobs storage=File1
 bin/bacula stop 2>&1 >/dev/null
 mkdir -p ${cwd}/tmp/bacula-restores
-exit
 bin/bextract -b working/restore.bsr -c bin/bacula-sd.conf ${cwd}/tmp ${cwd}/tmp/bacula-restores 2>&1 >/dev/null
 grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?