Flush changes

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

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index aee18ae874876d45661a6832c49584661b4d7369..983c114e270d0f0f5e87e5ca004251b6fc7afb92 100755 (executable)
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -8,8 +8,11 @@ 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
+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 " "
@@ -18,22 +21,23 @@ echo " === Starting compressed-test ===" >>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
 @output /dev/null
+status all
+status all
 messages
 @output tmp/log1.out
-label storage=File
-TestVolume001
-run job=CompressedTest
-yes
+label storage=File volume=TestVolume001
+run job=CompressedTest yes
 wait
 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
@@ -41,12 +45,13 @@ 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=$?
 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 " "