Final changes

[bacula/bacula] / regress / tests / sparse-test

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index f0b3ec8df15104056dee6a32f5a6748e8c4b6638..0e01188d6c2b42b1fd3f8074445d2698586837dc 100755 (executable)
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -7,18 +7,15 @@ cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
-bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
 
 echo " "
 echo " "
-echo " === Starting sparse-test ==="
-echo " === Starting sparse-test ===" >>working/log
+echo " === Starting sparse-test at `date +%R:%S` ==="
+echo " === Starting sparse-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -30,8 +27,9 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore
-5
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
 done
 yes
 wait
@@ -39,17 +37,25 @@ 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
+grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
-grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
+grep "^  Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
-diff -r build /tmp/bacula-restores${cwd}/build
+diff -r build tmp/bacula-restores${cwd}/build 2>&1 >/dev/null
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
    echo "  !!!!! sparse-test Bacula source failed!!! !!!!! "
    echo "  !!!!! sparse-test failed!!! !!!!! " >>test.out
+   if [ $bstat != 0 -o $rstat != 0 ] ; then
+      echo "  !!!!! Bad Job termination status     !!!!! "
+      echo "  !!!!! Bad Job termination status     !!!!! " >>test.out
+   else
+      echo "  !!!!! Restored files differ          !!!!! "
+      echo "  !!!!! Restored files differ          !!!!! " >>test.out
+   fi
    echo " "
 else
    echo "  ===== sparse-test Bacula source OK ===== "