Doc updates

[bacula/bacula] / regress / tests / six-vol-test

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index ffa1f770affdc223ec97881f51cbed556607f7d1..8beaeb8d67a85639ef4298a5a24c788c457527cc 100755 (executable)
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -3,6 +3,11 @@
 # Create a 60MB file with random bytes. Back it up to 6 Volumes
 #   each constrained to 10MB using the automatic labeling feature.
 #
+
+if test ! -c /dev/urandom ; then
+   echo "No random device. Test skipped.\n"
+   exit 0
+fi
 cwd=`pwd`
 scripts/copy-testa-confs
 scripts/cleanup
@@ -12,41 +17,52 @@ echo "Creating a 56MB file with random data ..."
 dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000
 echo "largefile created"
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "
-echo " === Starting two-vol-test  ==="
-echo " === Starting two-vol-test  ===" >>working/log
+echo " === Starting six-vol-test  ==="
+echo " === Starting six-vol-test  ===" >>working/log
 echo " "
 
-bin/bacula start
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bacula start 2>&1 >/dev/null
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+@output /dev/null
 messages
-@output
-run job=MultiVol storage=File
-yes
+@output tmp/log1.out
+run job=MultiVol storage=File yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-restore where=${cwd}/tmp/bacula-restores
-5
+@output tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
 done
 yes
 wait
 messages
+@output
 quit
 END_OF_DATA
-bin/bacula stop
-diff tmp/largefile  tmp/bacula-restores${cwd}/tmp/largefile
-if [ $? != 0 ] ; then
+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=$?
+grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
+rstat=$?
+diff tmp/largefile  tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null
+if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== six-vol-test Bacula source failed!!! ===== "
-   echo "  ===== six-vol-test failed!!! ===== " >>test.out
+   echo "  !!!!! six-vol-test Bacula source failed!!! !!!!! "
+   echo "  !!!!! six-vol-test failed!!! !!!!! " >>test.out
    echo " "
 else
    echo "  ===== six-vol-test Bacula source OK ===== "