Add new more stringent maxvol2 test

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

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index 8f10d91599cc3e7268cfb38a7ef8bfed8e15ddce..47fc8e4362e392ccc39957cab40a26915de8a190 100755 (executable)
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -6,29 +6,29 @@
 TestName="compressed-test"
 JobName=compressed
 . scripts/functions
-set_debug 0
 
-scripts/copy-test-confs
 scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
+change_jobname CompressedTest $JobName
 start_test
       
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 status all
 status all
 messages
 label storage=File volume=TestVolume001
-run job=CompressedTest storage=File yes
+run job=$JobName storage=File yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -46,5 +46,9 @@ 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 "  !!!!! No compression !!!!!"
+   bstat=1
+fi
 end_test
-