X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Fnightly-disk;h=5229d02d786d341e0d6813ea78adcd184d3becc6;hb=HEAD;hp=43833cc6961d20249ec3ac6b2f513f2d4e423a12;hpb=dcf4448000d77f894ca0c4d39878eac18bfd06a4;p=bacula%2Fbacula

diff --git a/regress/nightly-disk b/regress/nightly-disk
index 43833cc696..5229d02d78 100755
--- a/regress/nightly-disk
+++ b/regress/nightly-disk
@@ -1,21 +1,36 @@
 #!/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 `date`"
-save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
-svn update
+rm -f dumps/*
+git pull
+#
+# Temp switch to branch Branch-5.0 NB this leaves you on a headless
+#    branch, but it works for building and testing.
+#
+#git checkout `git branch -r | grep "5\.0" | 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 ] ; then
+   if [ $rtn = 0 ] || [ "$rtn" = "8" ]; then
       break;
    fi
    echo "Submit failed, waiting 5 mins"
@@ -25,5 +40,4 @@ while [ $i -le 5 ]; do
    rtn=$?
    i=`expr $i + 1`
 done
-REGRESS_DEBUG=${save_debug}
 echo "End nightly-disk `date`"