X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Fnightly-disk;h=5229d02d786d341e0d6813ea78adcd184d3becc6;hb=ddc725f76df8b1f75e4bf36cd38e78a892637d59;hp=5fc91bc8cb4bf6112f4429bd607748d7f3b5b9d4;hpb=e647cde7606bb1f8450042769791c338912415e2;p=bacula%2Fbacula

diff --git a/regress/nightly-disk b/regress/nightly-disk
index 5fc91bc8cb..5229d02d78 100755
--- a/regress/nightly-disk
+++ b/regress/nightly-disk
@@ -1,24 +1,43 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 #
 # 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
+rm -f dumps/*
+git pull
+#
+# Temp switch to branch Branch-5.0 NB this leaves you on a headless
+#    branch, but it works for building and testing.
+#
+#git checkout `git branch -r | grep "5\.0" | 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
-REGRESS_DEBUG=${save_debug}
+   rtn=$?
+   i=`expr $i + 1`
+done
 echo "End nightly-disk `date`"