Merge branch 'master' into basejobv3

[bacula/bacula] / regress / nightly-disk

diff --git a/regress/nightly-disk b/regress/nightly-disk
index 5fc91bc8cb4bf6112f4429bd607748d7f3b5b9d4..a54163b4609c51f8fe7778bb19066bb9b714679e 100755 (executable)
--- a/regress/nightly-disk
+++ b/regress/nightly-disk
@@ -3,22 +3,29 @@
 # test only the disk based regression scripts
 #
 # Include full output
+LANG=C
 echo "Begin nightly-disk `date`"
 save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
-svn update
+rm -rf Testing
+git pull
+make distclean
 scripts/config_dart
+make setup
 nice ctest -D Nightly -R "^disk:"
-if [ $? != 0 ] ; then
+rtn=$?
+i=0
+while [ $i -le 5 ]; do
+   if [ $rtn = 0 ] || [ "$rtn" = "8" ]; then
+      break;
+   fi
+   echo "Submit failed, waiting 5 mins"
+   sleep 300
    echo "ctest failed re-running Submit"
    ctest -D NightlySubmit
-   if [ $? != 0 ] ; then
-      echo "Submit failed, waiting 5 mins"
-      sleep 300
-      echo "ctest failed re-running Submit a second time"
-      ctest -D NightlySubmit
-   fi
-fi
+   rtn=$?
+   i=`expr $i + 1`
+done
 REGRESS_DEBUG=${save_debug}
 echo "End nightly-disk `date`"