Merge branch 'master' into mvw/1361

[bacula/bacula] / regress / nightly-disk

diff --git a/regress/nightly-disk b/regress/nightly-disk
index 07ebc06a3ba68ac10b66694c03b05874153ad08f..6a9c5a804bdde27d556932a1a51e60c3295f709a 100755 (executable)
--- a/regress/nightly-disk
+++ b/regress/nightly-disk
@@ -3,7 +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
-scripts/do_sed
-ctest -D Nightly -R "all-non-root:"
+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:"
+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
+# Switch back to master
+git checkout master
+REGRESS_DEBUG=${save_debug}
+echo "End nightly-disk `date`"