Update

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2669 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/all-non-root-tape-tests b/regress/all-non-root-tape-tests
index 8b2527670d2e8433a98ad6bcccd935b39f34be89..99e6e9164ed777e031923cb9913d2405f51cd3a6 100755 (executable)
--- a/regress/all-non-root-tape-tests
+++ b/regress/all-non-root-tape-tests
@@ -16,6 +16,7 @@ tests/restore-by-file-tape
 tests/small-file-size-tape
 tests/truncate-bug-tape
 tests/two-pool-tape
+tests/2drive-incremental-2tape
 echo " "
 echo " "
 echo "Test results"

diff --git a/regress/tests/2drive-incremental-2tape b/regress/tests/2drive-incremental-2tape
index e330719aa0bf6fa80e5f296e6f7661ef9dc434f7..02fbcfc32c3dd84b11cf2ffcbc04a10f2da37fdf 100755 (executable)
--- a/regress/tests/2drive-incremental-2tape
+++ b/regress/tests/2drive-incremental-2tape
@@ -5,7 +5,11 @@
 #
 # This script uses the autochanger and two tapes
 #
-debug=1
+if test ! -e /dev/nst1; then
+   echo "Skipping 2drive-incremenatal-2tape test"
+   exit
+fi
+debug=0
 if test "$debug" -eq 1 ; then
   out="tee"
 else

diff --git a/regress/tests/relabel-tape b/regress/tests/relabel-tape
index f3155bb362e7687be09fb778d99be41c1e1186e1..b90c16e9e2616864c2a79b27baf91c6f002ef086 100755 (executable)
--- a/regress/tests/relabel-tape
+++ b/regress/tests/relabel-tape
@@ -4,7 +4,7 @@
 #   then backup four times, each with incremental then finally restore.
 #   It should require at least 4 different bsrs.
 #
-debug=1
+debug=0
 if test "$debug" -eq 1 ; then
   out="tee"
 else