Updates

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

diff --git a/regress/.cvsignore b/regress/.cvsignore
index 16455a941f4ad31a0ab27369d840c648ce3892c9..90b65e591645edf8d57101d7574ef4db8f2cf123 100644 (file)
--- a/regress/.cvsignore
+++ b/regress/.cvsignore
@@ -1,3 +1,4 @@
+config.out
 build
 bin
 test.out

diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed
index d12990b2d1914b398bfd364c90f8ec0f052665e4..6c465e7489e03a243c3f17f86db5e6793fd1e96b 100755 (executable)
--- a/regress/scripts/do_sed
+++ b/regress/scripts/do_sed
@@ -28,6 +28,10 @@ echo "s%@changer_path@%${4}%g" >>${out}
 echo "s%@tape_drive1@%${5}%g" >>${out}
 echo "s%@smtp_host@%${6}%g" >>${out}
 
+echo "AUTOCHANGER=\"${3}\"" >config.out
+echo "TAPE_DRIVE1=\"${5}\"" >>config.out
+
+
 # process .in files with sed script
 sed -f ${out} ${cwd}/scripts/test-bacula-dir.conf.in >${cwd}/scripts/test-bacula-dir.conf
 sed -f ${out} ${cwd}/scripts/new-test-bacula-dir.conf.in >${cwd}/scripts/new-test-bacula-dir.conf

diff --git a/regress/tests/2drive-incremental-2tape b/regress/tests/2drive-incremental-2tape
index 02fbcfc32c3dd84b11cf2ffcbc04a10f2da37fdf..0a55eac04b241770d00b30402577853d25b3ab6b 100755 (executable)
--- a/regress/tests/2drive-incremental-2tape
+++ b/regress/tests/2drive-incremental-2tape
@@ -5,8 +5,9 @@
 #
 # This script uses the autochanger and two tapes
 #
-if test ! -e /dev/nst1; then
-   echo "Skipping 2drive-incremenatal-2tape test"
+. config.out
+if test x${TAPE_DRIVE1} = x/dev/null ; then
+   echo "Skipping 2drive-incremenatal-2tape test. No second drive."
    exit
 fi
 debug=0

diff --git a/regress/tests/incremental-2tape b/regress/tests/incremental-2tape
index 086f28aa5231f002095458732def5f1c49f39c79..1ee97cd49c302f5c74d41557e22018a3a4c4ef0c 100755 (executable)
--- a/regress/tests/incremental-2tape
+++ b/regress/tests/incremental-2tape
@@ -5,6 +5,11 @@
 #
 # This script uses the autochanger and two tapes
 #
+. config.out
+if test x${AUTOCHANGER} = x/dev/null ; then
+   echo "incremental-2tape test skipped. No autochanger."
+   exit
+fi
 debug=0
 if test "$debug" -eq 1 ; then
   out="tee"

diff --git a/regress/tests/two-pool-tape b/regress/tests/two-pool-tape
index 3a1cd795a2f0181d4ec5de21c9bb979833a3c2bc..a9dabe443961218f82a916ccbe519d2e32bca2ea 100755 (executable)
--- a/regress/tests/two-pool-tape
+++ b/regress/tests/two-pool-tape
@@ -7,6 +7,11 @@
 #  is in /tmp/file-list, which is by default the Bacula
 #  source code (i.e. the build directory).
 #
+. config.out
+if test x${AUTOCHANGER} = x/dev/null ; then
+   echo "two-pool-tape test skipped. No autochanger."
+   exit
+fi
 debug=0
 if test "$debug" -eq 1 ; then
   out="tee"

diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index fc7d9fa15a27fe1b218ead5a5d4e10913c9698f4..5dc69f6713a0d56d4cd34c5c58b63f4a21314992 100755 (executable)
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -5,6 +5,11 @@
 #  Note, this test simulates the tape filling and writing to
 #   the next tape.
 #
+. config.out
+if test x${AUTOCHANGER} = x/dev/null ; then
+   echo "two-volume-tape test skipped. No autochanger."
+   exit
+fi
 debug=0
 if test "$debug" -eq 1 ; then
   out="tee"