Add new regression updates

[bacula/bacula] / regress / tests / weird-files-test

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 00c5fb37342e754fac45b20512272f9868f71ad7..07aaf8b806b5784fb4c9dfc1b8d98fc838c37ab7 100755 (executable)
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -19,12 +19,6 @@ scripts/cleanup
 #
 echo "${cwd}/weird-files" >/tmp/file-list
 echo "${cwd}/weird-files" >>/tmp/file-list
-bin/bacula stop 2>&1 >/dev/null
-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 " "
@@ -32,8 +26,7 @@ echo " === Starting weird filenames test ==="
 echo " === Starting weird filenames test ===" >>working/log
 echo " "
 
-# bin/bacula start 2>&1 >/dev/null
-bin/bacula start
+bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
@@ -48,7 +41,10 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File done
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
+done
 yes
 wait
 messages
@@ -71,6 +67,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo "  !!!!! Weird files test failed!!! !!!!! "
    echo "  !!!!! Weird files 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 "  ===== Weird files test OK ===== "