X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Fexperimental-disk-and-tape;h=b1bd2a0f77093fea460180135bcc1d532754b750;hb=5bad1eeb132895297e02096e33ddb0d3e6b6899f;hp=516a2b1234bbd50f7db1fbb15d1e1e09b43aaf48;hpb=436bec9677c2783a576c1baf4f0cbdb36d4bf5f0;p=bacula%2Fbacula

diff --git a/regress/experimental-disk-and-tape b/regress/experimental-disk-and-tape
index 516a2b1234..b1bd2a0f77 100755
--- a/regress/experimental-disk-and-tape
+++ b/regress/experimental-disk-and-tape
@@ -3,22 +3,28 @@
 # test only the disk based regression scripts
 #
 # Include full output
+LANG=C
 echo "Begin experimental-disk-and-tape `date`"
 save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
-svn update
+rm -rf Testing
+rm -f dumps/*
+git pull
 scripts/config_dart
 nice ctest -D Experimental -R "^(disk|tape):"
-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 ExperimentalSubmit
-   if [ $? != 0 ] ; then
-      echo "Submit failed, waiting 5 mins"
-      sleep 300
-      echo "ctest failed re-running Submit a second time"
-      ctest -D ExperimentalSubmit
-   fi
-fi
+   rtn=$?
+   i=`expr $i + 1`
+done
 REGRESS_DEBUG=${save_debug}
 echo "End experimental-disk-and-tape `date`"