From 7e6de392d0384faa1386946cf58c41f6913d415a Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 15 Dec 2005 20:52:25 +0000
Subject: [PATCH] Updates

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2678 91ce42f0-d328-0410-95d8-f526ca767f89
---
 regress/.cvsignore                     | 1 +
 regress/scripts/do_sed                 | 4 ++++
 regress/tests/2drive-incremental-2tape | 5 +++--
 regress/tests/incremental-2tape        | 5 +++++
 regress/tests/two-pool-tape            | 5 +++++
 regress/tests/two-volume-tape          | 5 +++++
 6 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/regress/.cvsignore b/regress/.cvsignore
index 16455a941f..90b65e5916 100644
--- 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 d12990b2d1..6c465e7489 100755
--- 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 02fbcfc32c..0a55eac04b 100755
--- 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 086f28aa52..1ee97cd49c 100755
--- 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 3a1cd795a2..a9dabe4439 100755
--- 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 fc7d9fa15a..5dc69f6713 100755
--- 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"
-- 
2.39.5