Update next-vol-test

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

diff --git a/regress/scripts/functions b/regress/scripts/functions
index ee1afe2cbfa84578ae7b64fb9b4f70bced985093..2947de38f7dfae6bf0b8a04d9fbc403ca66e3bd0 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -275,6 +275,7 @@ end_test()
    if [ $zstat != 0 ] ; then
       echo " "
       echo "  !!!!! $TestName failed!!! `date +%R:%S` !!!!! "
+      echo "   Status: zombie=$zstat backup=$bstat restore=$rstat diff=$dstat"
       echo "  !!!!! $TestName failed!!! `date +%R:%S` !!!!! " >>test.out
       echo "   Status: zombie=$zstat backup=$bstat restore=$rstat diff=$dstat" >>test.out
       echo " "
@@ -284,7 +285,9 @@ end_test()
       echo " "
       echo " "
       echo "  !!!!! $TestName failed!!! `date +%R:%S` !!!!! "
+      echo "   Status: zombie=$zstat backup=$bstat restore=$rstat diff=$dstat"
       echo "  !!!!! $TestName failed!!! `date +%R:%S` !!!!! " >>test.out
+      echo "   Status: zombie=$zstat backup=$bstat restore=$rstat diff=$dstat" >>test.out
       if [ $bstat != 0 -o $rstat != 0 ] ; then
          echo "  !!!!! Bad termination status       !!!!! "
          echo "  !!!!! Bad termination status       !!!!! " >>test.out
@@ -447,4 +450,3 @@ fi
 AUTOCHANGER_SCRIPT=${AUTOCHANGER_SCRIPT:-mtx-changer}
 LD_LIBRARY_PATH=$bin:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
-

diff --git a/regress/tests/next-vol-test b/regress/tests/next-vol-test
index 16c6a780cf21b66c7b9237476b7a8bcb567af7cb..739d160dedcf9d775ff29e4b5551fa14069ba787 100755 (executable)
--- a/regress/tests/next-vol-test
+++ b/regress/tests/next-vol-test
@@ -135,7 +135,6 @@ if [ "$debug" -eq 1 ]; then
 else
    diff tmp/normal tmp/real > /dev/null
 fi
-
 dstat=$?
 
 
@@ -265,8 +264,13 @@ if [ "$debug" -eq 1 ]; then
 else
    diff tmp/normal4 tmp/real4 > /dev/null
 fi
-
-dstat=`expr $? + $dstat`
+if [ $dstat -eq 0 ] ; then
+   dstat=$?
+   if [ $dstat -ne 0 ] ; then
+      echo "normal4 and real4 differ!!!!!"
+      echo "normal4 and real4 differ!!!!!"  >>test.out
+   fi
+fi
 
 # try to break the old code 
 # in this situation, we have 1 available volume (vol50) and bacula will try to use