X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Fnightly-all;h=28651ec3e589e38dff773fcf7096cc4f62329a87;hb=fc7ff23a3f3dc36ac85622c43c1337fba79f15d8;hp=67d6f141420b9a65d0d557232a8e54e8fb2c42b4;hpb=436bec9677c2783a576c1baf4f0cbdb36d4bf5f0;p=bacula%2Fbacula

diff --git a/regress/nightly-all b/regress/nightly-all
index 67d6f14142..28651ec3e5 100755
--- a/regress/nightly-all
+++ b/regress/nightly-all
@@ -3,22 +3,29 @@
 # run both the disk and the tape based regression tests.
 #
 # Include full output
+LANG=C
 echo "Begin nightly-all `date`"
 save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
-svn update
+rm -rf Testing
+rm -f dumps/*
+git pull
+make distclean
 scripts/config_dart
 nice ctest -D Nightly -R "^(disk|tape|changer):"
-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-all `date`"