regress: Fix chown error in make setup

[bacula/bacula] / regress / nightly-disk-and-tape

diff --git a/regress/nightly-disk-and-tape b/regress/nightly-disk-and-tape
index cbe537639b472e90f821920a118c9501b193b604..35907da739108fdf0120d92692f4386fbb983829 100755 (executable)
--- a/regress/nightly-disk-and-tape
+++ b/regress/nightly-disk-and-tape
@@ -1,16 +1,34 @@
 #!/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-and-tape `date`"
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
-svn update
+rm -rf Testing
+rm -f dumps/*
+git pull
+make distclean
 scripts/config_dart
 nice ctest -D Experimental -R "^(disk|tape):"
-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
-fi
-REGRESS_DEBUG=${save_debug}
+   ctest -D NightlySubmit
+   rtn=$?
+   i=`expr $i + 1`
+done
+echo "End nightly-disk-and-tape `date`"