X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fcompressed-test;h=47fc8e4362e392ccc39957cab40a26915de8a190;hb=ef33273cecc466a71ce597c06024d8fac53fbe1d;hp=aee18ae874876d45661a6832c49584661b4d7369;hpb=1005ad56bc33491d58604edfb2f0bb51e735fa34;p=bacula%2Fbacula diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test index aee18ae874..47fc8e4362 100755 --- a/regress/tests/compressed-test +++ b/regress/tests/compressed-test @@ -3,37 +3,35 @@ # Run a simple backup of the Bacula build directory using the compressed option # then restore it. # -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 +TestName="compressed-test" +JobName=compressed +. scripts/functions -echo " " -echo " " -echo " === Starting compressed-test ===" -echo " === Starting compressed-test ===" >>working/log -echo " " +scripts/cleanup +scripts/copy-test-confs +echo "${cwd}/build" >${cwd}/tmp/file-list -bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <${cwd}/tmp/bconcmds +@output messages -@output tmp/log1.out -label storage=File -TestVolume001 -run job=CompressedTest -yes +@$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 @# -@output tmp/log2.out -restore -5 +@$out ${cwd}/tmp/log2.out +restore where=${cwd}/tmp/bacula-restores select storage=File +unmark * +mark * done yes wait @@ -41,20 +39,16 @@ messages @output quit END_OF_DATA -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 -if [ $? != 0 -o $bstat != 0 -o $rstat != 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 - scripts/cleanup + +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 " !!!!! No compression !!!!!" + bstat=1 fi +end_test