ebl Simplify vtape usage

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

diff --git a/regress/scripts/create_sed b/regress/scripts/create_sed
index 350a31a2ea669a4b4c7faa57d1bd3611339b1ae5..7cc4e0ef2161ba063dab9b579c2ce8344b920b5d 100755 (executable)
--- a/regress/scripts/create_sed
+++ b/regress/scripts/create_sed
@@ -3,7 +3,7 @@
 # Create the sed file for configuring everything
 #
 cwd=`pwd`
-. ${cwd}/config
+. ${cwd}/scripts/functions
 mkdir -p ${cwd}/bin
 mkdir -p ${cwd}/tmp
 out="${cwd}/tmp/sed_tmp"

diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed
index 3fb34ff9e8ad3059ea65b4a9535f508b942fa2f3..0294c98308793110d604245621f90128043a4bd5 100755 (executable)
--- a/regress/scripts/do_sed
+++ b/regress/scripts/do_sed
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 cwd=`pwd`
-. ${cwd}/config
+. ${cwd}/scripts/functions
 mkdir -p ${cwd}/bin
 out="${cwd}/tmp/sed_tmp"
 

diff --git a/regress/scripts/functions b/regress/scripts/functions
index b76f70f5b004558543f14296bc4e05263239a176..8d6f6d92521acc92296e42aaf3334640b1d60eab 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -309,4 +309,21 @@ db_user=${db_user:-"regress"}
 db_password=${db_password:-""}
 
 CLIENT=${HOST}-fd
+
+if [ x$USE_VTAPE = xyes ]; then
+   mkdir -p $cwd/working/ach
+   SLOT1=1
+   SLOT2=2
+   TAPE_DRIVE=$cwd/working/ach/drive1
+   TAPE_DRIVE1=$cwd/working/ach/drive1
+   AUTOCHANGER=$cwd/working/ach/config
+   AUTOCHANGER_SCRIPT=disk-changer
+   DRIVE1=0
+   DRIVE2=1
+   cat > AUTOCHANGER <<EOF
+maxdrive=2
+maxslot=10
+EOF
+fi
+
 AUTOCHANGER_SCRIPT=${AUTOCHANGER_SCRIPT:-mtx-changer}