X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Fnightly-disk-and-tape;h=f32bea52173cb26865ee26a27a7a287c12cdd33d;hb=d22b0bc45ead3d714d8f58be0467b4a2f06ec3b9;hp=13ce71398846206b55faba9becd264eeba69feb4;hpb=4b61073af1339e8dd0c3e70298bd1abafb94b6c1;p=bacula%2Fbacula

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