X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fsparse-compressed-test;h=a4d40e1924b8c1d0497ab1163a984e6c5b167143;hb=513fb27c6ae7faf0be67bc68e3d7d3e326a3da84;hp=996d3ce8d12503399ca263697400c48b64092a39;hpb=c4d3e4a4f6af72c0003ca8b062b6085bc4987d45;p=bacula%2Fbacula

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index 996d3ce8d1..a4d40e1924 100755
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -11,12 +11,12 @@ bin/bacula stop 2>&1 >/dev/null
 
 echo " "
 echo " "
-echo " === Starting sparse-compressed-test ==="
-echo " === Starting sparse-compressed-test ===" >>working/log
+echo " === Starting sparse-compressed-test at `date +%R:%S` ==="
+echo " === Starting sparse-compressed-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.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
@@ -37,9 +37,9 @@ 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 2>&1 >/dev/null
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
@@ -47,9 +47,16 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo "  !!!!! sparse-compressed-test Bacula source failed!!! !!!!! "
    echo "  !!!!! sparse-compressed-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-compressed-test Bacula source OK ===== "
-   echo "  ===== sparse-compressed-test OK ===== " >>test.out
+   echo "  ===== sparse-compressed-test Bacula source OK `date +%R:%S` ===== "
+   echo "  ===== sparse-compressed-test OK `date +%R:%S` ===== " >>test.out
    scripts/cleanup
 fi