ebl tweak base scripts to use faketape

     Add AUTOCHANGER_SCRIPT variable (default to mtx-changer)

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

diff --git a/regress/scripts/bacula-sd-2d.conf.in b/regress/scripts/bacula-sd-2d.conf.in
index 466b68fcc6f2689c665780162cde2916783fc2a9..bb80a48ebbc1419e1dea4e730c04223eb5d93f92 100644 (file)
--- a/regress/scripts/bacula-sd-2d.conf.in
+++ b/regress/scripts/bacula-sd-2d.conf.in
@@ -31,7 +31,7 @@ Director {
 Autochanger {
   Name = DDS-4
   Changer Device = @autochanger@
-  Changer Command ="@scriptdir@/mtx-changer %c %o %S %a %d"
+  Changer Command ="@scriptdir@/@changer_script@ %c %o %S %a %d"
   Device = Drive-0         
 }
 

diff --git a/regress/scripts/bacula-sd-2drive.conf.in b/regress/scripts/bacula-sd-2drive.conf.in
index 8ee4dbd62931174ae554df3d72def4d38eaa4d54..12d2e8d6c755470ea441d1da070eb77d5ed64e9b 100644 (file)
--- a/regress/scripts/bacula-sd-2drive.conf.in
+++ b/regress/scripts/bacula-sd-2drive.conf.in
@@ -34,7 +34,7 @@ Director {
 Autochanger {
   Name = DDS-4
   Changer Device = @autochanger@
-  Changer Command ="@scriptdir@/mtx-changer %c %o %S %a %d"
+  Changer Command ="@scriptdir@/@changer_script@ %c %o %S %a %d"
   Device = Drive-0, Drive-1
 }
 

diff --git a/regress/scripts/bacula-sd-2tape.conf.in b/regress/scripts/bacula-sd-2tape.conf.in
index 4abd813945389be800295f56f9c914da9831f8d7..07a50c4085b30c429339e6a103bc4c28284bad0a 100644 (file)
--- a/regress/scripts/bacula-sd-2tape.conf.in
+++ b/regress/scripts/bacula-sd-2tape.conf.in
@@ -34,7 +34,7 @@ Director {
 Autochanger {
   Name = DDS-4
   Changer Device = @autochanger@
-  Changer Command ="@scriptdir@/mtx-changer %c %o %S %a %d"
+  Changer Command ="@scriptdir@/@changer_script@ %c %o %S %a %d"
   Device = Drive-0
 }
 

diff --git a/regress/scripts/cleanup-2drive.in b/regress/scripts/cleanup-2drive.in
index a4ff193dd89f6663af8c4027c7ceb550e07940ee..a6c64911feeaef38fc5a1f3beb7953e4c38c5705 100755 (executable)
--- a/regress/scripts/cleanup-2drive.in
+++ b/regress/scripts/cleanup-2drive.in
@@ -5,40 +5,40 @@
 scripts/cleanup
 
 if test x@autochanger@ != x/dev/null; then
-   slot=`bin/mtx-changer @autochanger@ loaded 0 @tape_drive1@ 1`
+   slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive1@ 1`
    echo "Slot $slot in drive 1"
    if test x$slot != x0 ; then
       echo "unload slot $slot in drive 1"
-      bin/mtx-changer @autochanger@ unload $slot @tape_drive1@ 1
+      bin/@changer_script@ @autochanger@ unload $slot @tape_drive1@ 1
    fi
-   slot=`bin/mtx-changer @autochanger@ loaded 0 @tape_drive@ 0`
+   slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive@ 0`
    echo "Slot $slot in drive 0"
    if test x$slot != x0 ; then
       echo "unload slot $slot in drive 0"
-      bin/mtx-changer @autochanger@ unload $slot @tape_drive@ 0
+      bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ 0
    fi
 
 
-   slot=`bin/mtx-changer @autochanger@ loaded 0 @tape_drive1@ 1`
+   slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive1@ 1`
    if test x$slot != x$SLOT2; then
       echo "load slot $SLOT2 in drive 1"
-      bin/mtx-changer @autochanger@ load $SLOT2 @tape_drive1@ 1
+      bin/@changer_script@ @autochanger@ load $SLOT2 @tape_drive1@ 1
    fi
    echo "WEOF drive 1"
    mt -f @tape_drive1@ rewind
    mt -f @tape_drive1@ weof
    echo "unload slot $SLOT2 in drive 1"
-   bin/mtx-changer @autochanger@ unload $SLOT2 @tape_drive1@ 1
+   bin/@changer_script@ @autochanger@ unload $SLOT2 @tape_drive1@ 1
 
-   slot=`bin/mtx-changer @autochanger@ loaded 0 @tape_drive@ 0`
+   slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive@ 0`
    echo "Slot $slot in drive 0"
    if test x$slot != x$SLOT1; then
       echo "load slot $SLOT1 in drive 0"
-      bin/mtx-changer @autochanger@ load $SLOT1 @tape_drive@ 0
+      bin/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ 0
    fi
    echo "WEOF drive 0"
    mt -f @tape_drive@ rewind
    mt -f @tape_drive@ weof
    echo "unload slot $SLOT1 from drive 0"
-   bin/mtx-changer @autochanger@ unload $SLOT1 @tape_drive@ 0
+   bin/@changer_script@ @autochanger@ unload $SLOT1 @tape_drive@ 0
 fi

diff --git a/regress/scripts/cleanup-2tape.in b/regress/scripts/cleanup-2tape.in
index a4c90ab0b9a25be25a2cd1f8ec17f125a86c6e2c..b937ea115ee900b0cadb23dddcd035127416837a 100755 (executable)
--- a/regress/scripts/cleanup-2tape.in
+++ b/regress/scripts/cleanup-2tape.in
@@ -8,13 +8,13 @@
 scripts/cleanup
 
 if test x@autochanger@ != x/dev/null; then
-   slot=`bin/mtx-changer @autochanger@ loaded 0 dummy $DRIVE1`
+   slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive@ $DRIVE1`
    if test "x${slot}" != "x$SLOT2"; then
-      bin/mtx-changer @autochanger@ unload $slot @tape_drive@ $DRIVE1
-      bin/mtx-changer @autochanger@ load $SLOT2 @tape_drive@ $DRIVE1
+      bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1
+      bin/@changer_script@ @autochanger@ load $SLOT2 @tape_drive@ $DRIVE1
    fi
-   mt -f @tape_drive@ rewind
-   mt -f @tape_drive@ weof
+
+   init_drive @tape_drive@
 fi
 
 
@@ -22,17 +22,12 @@ fi
 # If we have an autochanger always load tape in slot 1
 #
 if test x@autochanger@ != x/dev/null; then
-   slot=`bin/mtx-changer @autochanger@ loaded 0 dummy $DRIVE1`
+   slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive@ $DRIVE1`
    if test "x${slot}" != "x$SLOT1"; then
-      bin/mtx-changer @autochanger@ unload $slot @tape_drive@ $DRIVE1
-      bin/mtx-changer @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1
+      bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1
+      bin/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1
    fi
 fi
 
-if test a$USE_FAKETAPE = a; then
-   mt -f @tape_drive@ rewind
-   mt -f @tape_drive@ weof
-else
-   cp /dev/null @tape_drive@
-fi
+init_drive @tape_drive@
 

diff --git a/regress/scripts/cleanup-tape.in b/regress/scripts/cleanup-tape.in
index 56724a43eaad60b4732f1d990458e020f0a9359b..ce996089c3df96acd89e8af7a731e89f4b610925 100755 (executable)
--- a/regress/scripts/cleanup-tape.in
+++ b/regress/scripts/cleanup-tape.in
@@ -2,21 +2,18 @@
 #
 # Cleanup left over files -- both before and after test run
 #
-. ./config
+
+. scripts/functions
 
 scripts/cleanup
 
 if test "x@autochanger@" != "x/dev/null" ; then
-   a=`bin/mtx-changer @autochanger@ loaded $SLOT1 @tape_drive@ 0`
+   a=`bin/@changer_script@ @autochanger@ loaded $SLOT1 @tape_drive@ 0`
    if test $a = 0 ; then
-     bin/mtx-changer @autochanger@ load $SLOT1 @tape_drive@ 0
+     bin/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ 0
    fi
 fi
 
-if test a$USE_FAKETAPE = a; then
-   mt -f @tape_drive@ rewind
-   mt -f @tape_drive@ weof
-else
-   cp /dev/null @tape_drive@
-fi
+init_drive @tape_drive@
+
 

diff --git a/regress/scripts/create_sed b/regress/scripts/create_sed
index 11ba5ff81ed269ee85869ff6970b6526748c06e3..665913c518920b6a21436205d60e2fdb2b3c2b13 100755 (executable)
--- a/regress/scripts/create_sed
+++ b/regress/scripts/create_sed
@@ -10,6 +10,7 @@ out="${cwd}/tmp/sed_tmp"
 
 # set the ports used by these tests
 BASEPORT=${BASEPORT:-8101}
+AUTOCHANGER_SCRIPT=${AUTOCHANGER_SCRIPT:-mtx-changer}
 LIBDBI=${LIBDBI:- }
 libdbi=${LIBDBI}
 srcdir=${BACULA_SOURCE}
@@ -30,6 +31,7 @@ echo "s%@subsysdir@%${cwd}/working%g" >>${out}
 echo "s%@job_email@%${EMAIL}%g" >>${out}
 echo "s%@tape_drive@%${TAPE_DRIVE}%g" >>${out}
 echo "s%@autochanger@%${AUTOCHANGER}%g" >>${out}
+echo "s%@changer_script@%${AUTOCHANGER_SCRIPT}%g" >>${out}
 echo "s%@tmpdir@%${cwd}/tmp%g" >>${out}
 echo "s%@hostname@%${HOST}%g" >>${out}
 echo "s%@changer_path@%${AUTOCHANGER_PATH}%g" >>${out}

diff --git a/regress/scripts/functions b/regress/scripts/functions
index 7a29bc48a1ba2a43ac2ae0ee8a7b19ecae9c412d..a6ab409bae40b39cd3b34b391e9378d618c6179d 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -252,6 +252,16 @@ debug_wait()
   fi
 }
 
+init_drive()
+{
+  if test a$USE_FAKETAPE = a; then
+    mt -f $1 rewind
+    mt -f $1 weof
+  else
+    cp /dev/null $1
+  fi
+}
+
 # Save current directory
 cwd=`pwd`
 if test "x${REGRESS_DEBUG}" = "x1"; then

diff --git a/regress/scripts/prepare-two-tapes.in b/regress/scripts/prepare-two-tapes.in
index 1da184650929e832e42940a065dc4d95e83b0b44..b937ea115ee900b0cadb23dddcd035127416837a 100755 (executable)
--- a/regress/scripts/prepare-two-tapes.in
+++ b/regress/scripts/prepare-two-tapes.in
@@ -8,13 +8,13 @@
 scripts/cleanup
 
 if test x@autochanger@ != x/dev/null; then
-   slot=`bin/mtx-changer @autochanger@ loaded 0 dummy $DRIVE1`
+   slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive@ $DRIVE1`
    if test "x${slot}" != "x$SLOT2"; then
-      bin/mtx-changer @autochanger@ unload $slot @tape_drive@ $DRIVE1
-      bin/mtx-changer @autochanger@ load $SLOT2 @tape_drive@ $DRIVE1
+      bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1
+      bin/@changer_script@ @autochanger@ load $SLOT2 @tape_drive@ $DRIVE1
    fi
-   mt -f @tape_drive@ rewind
-   mt -f @tape_drive@ weof
+
+   init_drive @tape_drive@
 fi
 
 
@@ -22,16 +22,12 @@ fi
 # If we have an autochanger always load tape in slot 1
 #
 if test x@autochanger@ != x/dev/null; then
-   slot=`bin/mtx-changer @autochanger@ loaded 0 dummy $DRIVE1`
+   slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive@ $DRIVE1`
    if test "x${slot}" != "x$SLOT1"; then
-      bin/mtx-changer @autochanger@ unload $slot @tape_drive@ $DRIVE1
-      bin/mtx-changer @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1
+      bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1
+      bin/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1
    fi
 fi
 
-if test a$USE_FAKETAPE = a; then
-   mt -f @tape_drive@ rewind
-   mt -f @tape_drive@ weof
-else
-   cp /dev/null @tape_drive@
-fi
+init_drive @tape_drive@
+