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

diff --git a/regress/nightly-disk b/regress/nightly-disk
index c3add40e1d..5229d02d78 100755
--- a/regress/nightly-disk
+++ b/regress/nightly-disk
@@ -1,11 +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
-save_debug=${REGRESS_DEBUG}
+LANG=C
+echo "Begin nightly-disk `date`"
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
+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
-nice ctest -D Nightly -R "all-non-root:"
-REGRESS_DEBUG=${save_debug}
+make setup
+nice ctest -D Nightly -R "^disk:"
+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
+   rtn=$?
+   i=`expr $i + 1`
+done
+echo "End nightly-disk `date`"