regress: update error messages in accurate-test

[bacula/bacula] / regress / nightly-disk

diff --git a/regress/nightly-disk b/regress/nightly-disk
index 43833cc6961d20249ec3ac6b2f513f2d4e423a12..8a0034c73de85aa416388507e5b85fb3dcb6d4d0 100755 (executable)
--- a/regress/nightly-disk
+++ b/regress/nightly-disk
@@ -9,13 +9,22 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
-svn update
+git pull
+#
+# Temp switch to branch 3.0.3
+#
+git checkout `git branch -r | grep "3\.0\.3" | line`
+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 +34,7 @@ while [ $i -le 5 ]; do
    rtn=$?
    i=`expr $i + 1`
 done
+# Switch back to master
+git checkout master
 REGRESS_DEBUG=${save_debug}
 echo "End nightly-disk `date`"