X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fcompressed-test;h=47fc8e4362e392ccc39957cab40a26915de8a190;hb=d0afb9386d99f0e4f14dc065a5eb5109fb2befe4;hp=491feee379b494ef313b24df3ad206d4805a350c;hpb=cac876e743b1fcbf3d9b008bc7a9eab37dc19676;p=bacula%2Fbacula

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index 491feee379..47fc8e4362 100755
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -3,53 +3,52 @@
 # Run a simple backup of the Bacula build directory using the compressed option
 #   then restore it.
 #
-cwd=`pwd`
-scripts/copy-test-confs
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores
-echo "${cwd}/build" >/tmp/file-list
-bin/bacula stop 
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+TestName="compressed-test"
+JobName=compressed
+. scripts/functions
 
-echo " "
-echo " "
-echo " === Starting compressed-test ==="
-echo " "
-echo " "
+scripts/cleanup
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
-bin/bacula start
-bin/console -c bin/console.conf <<END_OF_DATA
-@output /dev/null
-messages
+change_jobname CompressedTest $JobName
+start_test
+      
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output
-label
-TestVolume001
-run job=CompressedTest
-yes
+messages
+@$out ${cwd}/tmp/log1.out
+status all
+status all
+messages
+label storage=File volume=TestVolume001
+run job=$JobName storage=File yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-restore
-5
+@$out ${cwd}/tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
 done
 yes
 wait
-@output /dev/null
 messages
+@output
 quit
 END_OF_DATA
-bin/bacula stop
-diff -ur build /tmp/bacula-restores${cwd}/build
+
+run_bacula
+check_for_zombie_jobs storage=File
+stop_bacula
+
+check_two_logs
+check_restore_diff
+grep " Software Compression" ${cwd}/tmp/log1.out | grep "%" 2>&1 1>/dev/null
 if [ $? != 0 ] ; then
-   echo " "
-   echo " "
-   echo "  ===== compressed-test Bacula source failed!!! ===== "
-   echo "  ===== compressed-test failed!!! ===== " >>test.out
-   echo " "
-else
-   echo "  ===== compressed-test Bacula source OK ===== "
-   echo "  ===== compressed-test OK ===== " >>test.out
+   echo "  !!!!! No compression !!!!!"
+   bstat=1
 fi
-rm -rf /tmp/bacula-restores
+end_test