X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Fnightly-disk;h=6a9c5a804bdde27d556932a1a51e60c3295f709a;hb=143a5d11e207d0e14e25593045640c26ddb5d34c;hp=4ef61072af62cc4f1f0386994624923157290916;hpb=2d27e3a6de8a2048f10ee672ed7edf11bae1b509;p=bacula%2Fbacula

diff --git a/regress/nightly-disk b/regress/nightly-disk
index 4ef61072af..6a9c5a804b 100755
--- a/regress/nightly-disk
+++ b/regress/nightly-disk
@@ -3,21 +3,39 @@
 # test only the disk based regression scripts
 #
 # Include full output
+LANG=C
+echo "Begin nightly-disk `date`"
 save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
-svn update
+rm -rf Testing
+git pull
+#
+# Temp switch to branch 3.0.3 NB this leaves you on a headless
+#    branch, but it works for building and testing.
+#
+git checkout `git branch -r | grep "3\.0\.3" | head -1`
+if [ $? -ne 0 ]; then
+   git checkout master
+fi
+make distclean
 scripts/config_dart
+make setup
 nice ctest -D Nightly -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 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
+# Switch back to master
+git checkout master
 REGRESS_DEBUG=${save_debug}
 echo "End nightly-disk `date`"