Fix 2drive-incremental-2disk test

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4985 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/scripts/functions b/regress/scripts/functions
index da99da660590ddc8e811dc1b36711dd7a07e0e91..cf3511167093b6c43ff52a84485707d5378e7c15 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -119,9 +119,11 @@ end_test()
       if [ $bstat != 0 -o $rstat != 0 ] ; then
          echo "  !!!!! Bad Job termination status     !!!!! "
          echo "  !!!!! Bad Job termination status     !!!!! " >>test.out
+         echo "        bstat=$bstat rstat=$rstat dstat=$dstat"
       else
          echo "  !!!!! Restored files differ          !!!!! "
          echo "  !!!!! Restored files differ          !!!!! " >>test.out
+         echo "        bstat=$bstat rstat=$rstat dstat=$dstat"
       fi
       echo " "
    else

diff --git a/regress/tests/2drive-incremental-2disk b/regress/tests/2drive-incremental-2disk
index 79f711a6ba722ad13449bca0bfefeaa149eafb16..4a4b84a8bee634e2795920ce604d21a6612204ed 100755 (executable)
--- a/regress/tests/2drive-incremental-2disk
+++ b/regress/tests/2drive-incremental-2disk
@@ -96,7 +96,8 @@ stop_bacula
 
 check_two_logs
 # The restore should read from TestVolume002, which was on drive 1
-grep tmp/log2.out TestVolume002
+grep TestVolume002 tmp/log2.out >/dev/null 2>&1
+# Note rstat may already be set, so we don't just store into it
 if [ $? != 0 ] ; then
    rstat=$?
 fi