X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Fnightly-disk-and-tape;h=35907da739108fdf0120d92692f4386fbb983829;hb=HEAD;hp=7668d955cbc395799154f311da8764be0bf677c5;hpb=e647cde7606bb1f8450042769791c338912415e2;p=bacula%2Fbacula

diff --git a/regress/nightly-disk-and-tape b/regress/nightly-disk-and-tape
index 7668d955cb..35907da739 100755
--- a/regress/nightly-disk-and-tape
+++ b/regress/nightly-disk-and-tape
@@ -1,24 +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
+LANG=C
 echo "Begin nightly-disk-and-tape `date`"
-save_debug=${REGRESS_DEBUG}
 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
-   echo "ctest failed re-running Submit"
-   ctest -D ExperimentalSubmit
-   if [ $? != 0 ] ; then
-      echo "Submit failed, waiting 5 mins"
-      sleep 300
-      echo "ctest failed re-running Submit a second time"
-      ctest -D NightlySubmit
+rtn=$?
+i=0
+while [ $i -le 5 ]; do
+   if [ $rtn = 0 ] || [ "$rtn" = "8" ] ; then
+      break;
    fi
-fi
-REGRESS_DEBUG=${save_debug}
+   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-and-tape `date`"