Before done change

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

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index c12d7b3fc2e4eb53124906d4b9a0dcc441db5c1b..0d6aadce12c9649a746150936d9d334a541b1c68 100644 (file)
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -36,6 +36,7 @@ Job {
   Pool = Default
   Write Bootstrap = "@working_dir@/NightlySave.bsr"
   Maximum Concurrent Jobs = 4
+  SpoolData = yes
 }
 
 

diff --git a/regress/scripts/check_for_zombie_jobs b/regress/scripts/check_for_zombie_jobs
new file mode 100755 (executable)
index 0000000..5fae9d3
--- /dev/null
+++ b/regress/scripts/check_for_zombie_jobs
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# Check for zombie jobs (not terminated).
+# Also scan logs for ERROR messages
+#
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+@output tmp/dir.out
+status dir
+@output tmp/fd.out
+status client
+@output tmp/sd.out
+status $1
+@output
+quit
+END_OF_DATA
+grep "No Jobs running." tmp/dir.out 2>&1 >/dev/null
+if [ $? != 0 ] ; then
+  echo " "
+  echo "  !!!! Zombie Jobs in Director !!!!"
+  echo "  !!!! Zombie Jobs in Director !!!!" >>test.out
+  echo " "
+fi
+grep "No Jobs running." tmp/fd.out 2>&1 >/dev/null
+if [ $? != 0 ] ; then
+  echo " "
+  echo "  !!!! Zombie Jobs in File daemon !!!!"
+  echo "  !!!! Zombie Jobs in File daemon !!!!" >>test.out
+  echo " "
+fi
+grep "No Jobs running." tmp/sd.out 2>&1 >/dev/null
+if [ $? != 0 ] ; then
+  echo " "
+  echo "  !!!! Zombie Jobs in Storage daemon !!!!"
+  echo "  !!!! Zombie Jobs in Storage daemon !!!!" >>test.out
+  echo " "
+fi
+grep "ERROR" tmp/log*.out 2>&1 >/dev/null
+if [ $? = 0 ] ; then
+  echo " "
+  echo "  !!!! ERROR in log output !!!!"
+  echo "  !!!! ERROR in log output !!!!" >>test.out
+  echo " "
+fi
+grep "Fatal Error" tmp/log*.out 2>&1 >/dev/null
+if [ $? = 0 ] ; then
+  echo " "
+  echo "  !!!! Fatal Error in log output !!!!"
+  echo "  !!!! Fatal Error in log output !!!!" >>test.out
+  echo " "
+fi
+
+

diff --git a/regress/scripts/cleanup b/regress/scripts/cleanup
index 4e13d2bf59891c6bc80178f1ee98fd6e10e154b4..2cb9f56efab70602cfb4f7d035d1d48d245147c2 100755 (executable)
--- a/regress/scripts/cleanup
+++ b/regress/scripts/cleanup
@@ -7,4 +7,5 @@ rm -rf tmp/original tmp/bacula-restores tmp/Small* tmp/TestVolume*
 rm -rf tmp/restored tmp/largefile tmp/bscan.bsr tmp/log*.out
 rm -rf /tmp/sed_tmp /tmp/file-list
 rm -rf tmp/build tmp/restore-list tmp/restore2-list
+rm -rf tmp/fd.out tmp/dir.out tmp/sd.out
 rm -rf working/log

diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in
index 348110741c69fb6a7bfd4e48133f50d4309e9879..38af2f88c2e520b8e3592a35f9e4a6cd848e6668 100644 (file)
--- a/regress/scripts/test-bacula-dir.conf.in
+++ b/regress/scripts/test-bacula-dir.conf.in
@@ -37,6 +37,7 @@ Job {
   Pool = Default
   Write Bootstrap = "@working_dir@/NightlySave.bsr"
   Maximum Concurrent Jobs = 4
+  SpoolData=yes
 }
 
 Job {

diff --git a/regress/scripts/testa-bacula-dir.conf.in b/regress/scripts/testa-bacula-dir.conf.in
index 13bbfcd53def5e85d6b33c8dc2a2090ec1f2ca63..6a2aba037215ba31cbc5ae289ee176345ad4aa9f 100644 (file)
--- a/regress/scripts/testa-bacula-dir.conf.in
+++ b/regress/scripts/testa-bacula-dir.conf.in
@@ -27,6 +27,7 @@ Job {
   Messages = Standard
   Write Bootstrap = "@working_dir@/SmallVols.bsr"
   Pool = SmallVols
+  SpoolData = yes
 }
 
 

diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index ec34dddb81446354878af534e2459d26e66dd4b1..09b6da925d9b899cefca7078e84facb46328eaff 100755 (executable)
--- a/regress/tests/backup-bacula-tape
+++ b/regress/tests/backup-bacula-tape
@@ -59,6 +59,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 26d54bc5bf5710607430d308eff7b7a845b80cc9..2d126acd5c98dead33edba6a03923ec826b0fb79 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -39,6 +39,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index 0587542625c31a4c783e5af029aa247fc2563b26..314105bca8967fd655ad09f7364dd0fa7c79b550 100755 (executable)
--- a/regress/tests/bextract-test
+++ b/regress/tests/bextract-test
@@ -43,6 +43,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File1
 bin/bacula stop 2>&1 >/dev/null
 mkdir -p ${cwd}/tmp/bacula-restores
 bin/bextract -b working/restore.bsr -c bin/bacula-sd.conf ${cwd}/tmp ${cwd}/tmp/bacula-restores 2>&1 >/dev/null

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index c41972290a423a3a200ea20f10cf215bcba5d54c..a7d0bf0400d2f263a0047dbee0d978255169432c 100755 (executable)
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -49,6 +49,7 @@ yes
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File1
 bin/bacula stop 2>&1 >/dev/null
 echo "volume=TestVolume001|TestVolume002" >tmp/bscan.bsr
 bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >/dev/null
@@ -67,6 +68,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File1
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index adee285f2b13406554db831781bb843469131e56..82eb76e541591db876d6350fead50d259bfce256 100755 (executable)
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -50,6 +50,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File1
 bin/bacula stop 2>&1 >/dev/null
 #
 # This test is not really reliable. What we want to do is

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index 7857b00bf5d0b56b4c82577835f8c9c9b7ea38bd..983c114e270d0f0f5e87e5ca004251b6fc7afb92 100755 (executable)
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -35,13 +35,17 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
+done
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test
index 99bb1cd186ccd40a3f15e2b656913c6efe5a4f69..1877e0b200b5832c4a75332e08bf71083fd28ebd 100755 (executable)
--- a/regress/tests/concurrent-jobs-test
+++ b/regress/tests/concurrent-jobs-test
@@ -51,13 +51,17 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
+done
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null

diff --git a/regress/tests/decremental-test b/regress/tests/decremental-test
index cc6abbcfe3d25142f67597a82cb1e7dd191a493a..2e40a3f04e02d93fcd809d981a5fdba2fd286d4c 100755 (executable)
--- a/regress/tests/decremental-test
+++ b/regress/tests/decremental-test
@@ -38,6 +38,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
@@ -51,6 +52,7 @@ wait
 messages
 @output
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
@@ -70,6 +72,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root
index ee7634ef6f3a83e320b1f90e3ad3d54ce5001395..59ec79755f9b5e733f3681f48b88610a3b3d0dee 100755 (executable)
--- a/regress/tests/etc-test-root
+++ b/regress/tests/etc-test-root
@@ -42,7 +42,10 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select    
+unmark *
+mark *
+done
 yes
 wait
 messages

diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape
index 98d91a26e109b43230392835fd84562c94295691..089f28696af65aaddb305f847a60f4ac73bccb6c 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-tape
+++ b/regress/tests/four-concurrent-jobs-tape
@@ -19,8 +19,7 @@ echo " === Starting four-concurrent-jobs-tape  ==="
 echo " === Starting four-concurrent-jobs-tape  ===" >>working/log
 echo " "
 
-#bin/bacula start 2>&1 >/dev/null
-bin/bacula start
+bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
@@ -40,13 +39,17 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4
+restore where=${cwd}/tmp/bacula-restores select storage=DDS-4
+unmark *
+mark *
+done
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index abd55c631ac529e19539399a1e38086cc9273172..fbcf54798d537e96d1eafa30824f67d002e4e259 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -49,13 +49,17 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File1
+restore where=${cwd}/tmp/bacula-restores select storage=File1
+unmark *
+mark *
+done
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File1
 
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null

diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape
index ee6d70fbf0fb05da9c742bb896ae000874c20b4d..78ac24d78de274f724d8e143b016ee7b399ee0fb 100755 (executable)
--- a/regress/tests/four-jobs-tape
+++ b/regress/tests/four-jobs-tape
@@ -36,6 +36,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 echo "Backup 1 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o
@@ -53,6 +54,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 echo "Backup 2 done"
 touch ${cwd}/build/src/dird/*.c
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
@@ -68,6 +70,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 echo "Backup 3 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
@@ -83,6 +86,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 echo "Backup 4 done"
 # 
 # now do several restores to ensure we cleanup between jobs
@@ -96,7 +100,10 @@ restore where=${cwd}/tmp/bacula-restores select all
 yes
 wait
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select
+unmark *
+mark *
+done
 yes
 wait
 messages

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index 30f42fbca6d6e87209a5809b5e9d7124167535f8..3299e33af8be4bb9753883d844abd9e1cd6b0567 100755 (executable)
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -35,6 +35,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 echo "Backup 1 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o
@@ -53,6 +54,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 echo "Backup 2 done"
 touch ${cwd}/build/src/dird/*.c
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
@@ -69,6 +71,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 echo "Backup 3 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
@@ -85,6 +88,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 echo "Backup 4 done"
 # 
 # now do several restores to ensure we cleanup between jobs
@@ -98,13 +102,17 @@ restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
+done
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape
index 278766a36cd01b2209d290917470f2988833fdba..88b4d86980b13eee0be2941827efa4b44e249980 100755 (executable)
--- a/regress/tests/incremental-tape
+++ b/regress/tests/incremental-tape
@@ -40,6 +40,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
@@ -63,6 +64,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index 375d7dad77a680e5c72a1c339a66f460728e2485..af4b922e53dd6460aaa2244dbd914f69f0fbf0d8 100755 (executable)
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -38,6 +38,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
@@ -60,6 +61,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/lib-test-root b/regress/tests/lib-test-root
index 2b5aa8159654ed5bf30e69d3c99ab1e51c22d196..10b67103780f90b5ea2fb50da67cb60980f66050 100755 (executable)
--- a/regress/tests/lib-test-root
+++ b/regress/tests/lib-test-root
@@ -42,7 +42,10 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select    
+unmark *
+mark *
+done
 yes
 wait
 messages

diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index f21171b8a4e4b5261261ca3a524bf21c7d41571b..d20ff409c609019d6453dd9a3a8e602b92f7c5d3 100755 (executable)
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -66,13 +66,17 @@ list volumes
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File1
+restore where=${cwd}/tmp/bacula-restores select storage=File1
+unmark *
+mark *
+done
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File1
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape
index f8dd658c3a79a53db78d9f4f4b66e48b3d0b9e3f..10959cdd3f15864c23c3469e75a3acfe3149afcf 100755 (executable)
--- a/regress/tests/restore-by-file-tape
+++ b/regress/tests/restore-by-file-tape
@@ -47,6 +47,7 @@ messages
 quit
 END_OF_DATA
 dstat=0
+scripts/check_for_zombie_jobs storage=DDS-4
 #
 # We need to stop and start Bacula to
 #  test appending to a previously written tape
@@ -99,6 +100,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 bin/bacula stop 2>&1 >/dev/null
 for i in `cat ${cwd}/tmp/restore2-list`; do
    diff $i ${cwd}/tmp/bacula-restores$i

diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test
index b120c6715d9f748cf403b37d0fd0066337ce300c..a0263631f6fc9b4528bd68da4390570b7a2020b0 100755 (executable)
--- a/regress/tests/restore-by-file-test
+++ b/regress/tests/restore-by-file-test
@@ -51,6 +51,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test
index 8da375d4d5df589cc997b34a795702e7671e7681..0b110bbc25790c55b3d6bdc979ab5f00fb1704cf 100755 (executable)
--- a/regress/tests/restore-disk-seek-test
+++ b/regress/tests/restore-disk-seek-test
@@ -68,6 +68,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 bin/bacula stop 2>&1 >/dev/null
 # Now setup a control directory of only what we *should* restore
 rm -rf ${cwd}/tmp/build

diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test
index acf8a457bedb442d34cd37dd951d1818faf34010..23570c1900fb2e07bec5a0478025757a83cd0ff9 100755 (executable)
--- a/regress/tests/restore2-by-file-test
+++ b/regress/tests/restore2-by-file-test
@@ -41,6 +41,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index 4b076d198b7a2b22645dd4413ab969ed0535ea07..8beaeb8d67a85639ef4298a5a24c788c457527cc 100755 (executable)
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -41,13 +41,17 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
+done
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 bin/bacula stop  2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape
index 497b1b539f3a585d9b2f96f0638eef0eca4d95eb..1d63936c90e3b7cac2dbf888dd72ae303c52764b 100755 (executable)
--- a/regress/tests/small-file-size-tape
+++ b/regress/tests/small-file-size-tape
@@ -35,13 +35,17 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4
+restore where=${cwd}/tmp/bacula-restores select storage=DDS-4
+unmark *
+mark *
+done
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test
index 36d52e014809905bcc8a66323dd66279dcfb7fad..6e1682efe67e954df5d1bf57b11cf5040dd4e472 100755 (executable)
--- a/regress/tests/span-vol-test
+++ b/regress/tests/span-vol-test
@@ -42,13 +42,17 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File1
+restore where=${cwd}/tmp/bacula-restores select storage=File1
+unmark *
+mark *
+done
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File1
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index 1c28061a714376b31e9deb4becd4a4e20269e395..7eacbb2daae4cab449dd4165b60be2e0a3e5215e 100755 (executable)
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -40,6 +40,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File 
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index ca44e623f15d7fc19c2bddc8ae2e0d660ee6214c..b040af024446e19994fa0cc9b08c9006f7b5c0ef 100755 (executable)
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -33,13 +33,17 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File 
+restore where=${cwd}/tmp/bacula-restores select storage=File 
+unmark *
+mark *
+done
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File 
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index 13c6a6297e234c116519c53b7431c29852d7ccba..6bd84cb750f7e4c1e5dc86a56b294617165400e8 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -22,6 +22,9 @@ echo " "
 
 bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+setdebug level=15  storage=File
+@output /dev/null
+messages
 @output /dev/null
 estimate job=CompressedTest listing
 estimate job=CompressedTest listing
@@ -34,6 +37,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File 
 echo "Backup 1 done"
 touch ${cwd}/build/src/dird/*.c
 #
@@ -58,13 +62,17 @@ restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
+done
 yes
 wait
 messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index 3149a628ce382f9aadc3041137a1a26cea300ea6..e58847b2f1a7c77b9d77b6829222febfd3a0f45a 100755 (executable)
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -42,6 +42,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File1
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index a212dc374859c8faf249d439e34f447f895ea389..9494de717ac511d0e09e3e3db29dcac29c13d994 100755 (executable)
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -46,6 +46,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 7f4913b93ea308a305918e505e4f788083a4cb94..eea92ce2324a05f2bbe3a52dca4841a65ff0f0f4 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -41,6 +41,7 @@ messages
 quit
 END_OF_DATA
 sleep 2
+scripts/check_for_zombie_jobs storage=File 
 bin/bacula stop 2>&1 >/dev/null
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 387fa3763eb076c56b55c394affbfead01a3b984..6eb4614ab82752d227cfe412c213bd60b035ecec 100755 (executable)
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -11,7 +11,14 @@ fi
 cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
+#
+# Note, we save the weird-files directory twice on purpose
+#  because this causes problems with hard linked files 
+#  that are only saved once.  In 1.33, Bacula now deals
+#  with this situation.
+#
 echo "${cwd}/weird-files" >/tmp/file-list
+echo "${cwd}/weird-files" >>/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
 cd bin
 ./drop_bacula_tables >/dev/null 2>&1
@@ -25,7 +32,8 @@ echo " === Starting weird filenames test ==="
 echo " === Starting weird filenames test ===" >>working/log
 echo " "
 
-bin/bacula start 2>&1 >/dev/null
+# bin/bacula start 2>&1 >/dev/null
+bin/bacula start
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
@@ -47,10 +55,11 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File 
 bin/bacula stop 2>&1 >/dev/null
-${cwd}/bin/testls weird-files >${cwd}/tmp/original
+${cwd}/bin/testls weird-files | sort >${cwd}/tmp/original
 cd tmp/bacula-restores${cwd}
-${cwd}/bin/testls weird-files >${cwd}/tmp/restored
+${cwd}/bin/testls weird-files | sort >${cwd}/tmp/restored
 cd ${cwd}
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?

diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index 755525c346870806f2028274e2d6ea955e7598ea..e44bcb6c6d7d50bc5a37bc29ad86d17a16024a50 100755 (executable)
--- a/regress/tests/weird-files2-test
+++ b/regress/tests/weird-files2-test
@@ -40,6 +40,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File 
 #
 # Now mess up the a hard link, and a soft link
 #
@@ -58,6 +59,8 @@ messages
 @output tmp/log2.out
 restore where= storage=File
 5
+unmark *
+mark *
 done
 yes
 wait
@@ -65,6 +68,7 @@ messages
 @output
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=File 
 bin/bacula stop 2>&1 >/dev/null
 bin/testls weird-files2 >${cwd}/tmp/restored
 grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null

diff --git a/regress/weird-files.tar.gz b/regress/weird-files.tar.gz
index 0ecbe3fc7215241cdfc3dfc18801eaaf23de9be2..d1b3a21226a7dcb330bf56fa24a30fa89c0d44ad 100644 (file)
Binary files a/regress/weird-files.tar.gz and b/regress/weird-files.tar.gz differ