X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Fnightly-all;h=28fedae9452b370c80666ee95736c3f86e6b5a72;hb=5de97c8320401f42d48574a2e31630facc1aceb4;hp=868bc105800a2cb28daec916d809981974f2be3d;hpb=944e26e263775cfe5c423032ea4b841b93d6af69;p=bacula%2Fbacula

diff --git a/regress/nightly-all b/regress/nightly-all
index 868bc10580..28fedae945 100755
--- a/regress/nightly-all
+++ b/regress/nightly-all
@@ -1,22 +1,34 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 #
 # run both the disk and the tape based regression tests.
 #
 # Include full output
-save_debug=${REGRESS_DEBUG}
+LANG=C
+echo "Begin nightly-all `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 Nightly -R "^(disk|tape|changer):"
-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-all `date`"