Add MediaView form that displays the Media list in a QTableWidget.

[bacula/bacula] / regress / nightly-disk

diff --git a/regress/nightly-disk b/regress/nightly-disk
index f72f00a9003f1e2729b46444d195a541eda62c3e..6a9c5a804bdde27d556932a1a51e60c3295f709a 100755 (executable)
--- a/regress/nightly-disk
+++ b/regress/nightly-disk
@@ -3,18 +3,29 @@
 # 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
+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
+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"
@@ -24,5 +35,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`"