Tweak virtual changer scripts

[bacula/bacula] / regress / experimental-all

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