X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Fexperimental-disk;h=a965df924255ad8fdbe2a69a8b8e66be1e33a5ac;hb=91f571c63d439dbc3e7fe8f9eec3d5f7beceb1bb;hp=9502ab29e43b8ab0fccff66782307278345da036;hpb=436bec9677c2783a576c1baf4f0cbdb36d4bf5f0;p=bacula%2Fbacula

diff --git a/regress/experimental-disk b/regress/experimental-disk
index 9502ab29e4..a965df9242 100755
--- a/regress/experimental-disk
+++ b/regress/experimental-disk
@@ -3,22 +3,28 @@
 # test only the disk based regression scripts
 #
 # Include full output
+LANG=C
 echo "Begin experimental-disk `date`"
 save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
-svn update
+rm -rf Testing
+git pull
 scripts/config_dart
+make setup
 nice ctest -D Experimental -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 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 `date`"