Tweak dir conf for migration to eliminate Allow Duplicates, which made test fail

[bacula/bacula] / regress / nightly-disk

diff --git a/regress/nightly-disk b/regress/nightly-disk
index e074f8efae3252fca3714f8bf6fc4c5b14422b9d..e9291c7a7ca0b36b22b7945f1eca74a8027066fc 100755 (executable)
--- a/regress/nightly-disk
+++ b/regress/nightly-disk
@@ -3,13 +3,37 @@
 # 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
+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
-nice ctest -D Nightly -R "all-non-root:"
-if [ $? != 0 ] ; then
+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
-fi
+   rtn=$?
+   i=`expr $i + 1`
+done
 REGRESS_DEBUG=${save_debug}
+echo "End nightly-disk `date`"