From: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed, 21 May 2008 16:56:53 +0000 (+0000)
Subject: ebl  cleanup dummy autochanger test
X-Git-Tag: Release-7.0.0~4555
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=db2954ef1c3a6b51d5d6dbfa15841df93a5cd1c6;p=bacula%2Fbacula

ebl  cleanup dummy autochanger test


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

diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed
index 37ac9fb1f6..f72c8a086c 100755
--- a/regress/scripts/do_sed
+++ b/regress/scripts/do_sed
@@ -42,7 +42,7 @@ sed -f ${out} ${cwd}/scripts/prepare-two-tapes.in >${cwd}/scripts/prepare-two-ta
 sed -f ${out} ${cwd}/scripts/bacula-dir.conf.testrunscript.in >${cwd}/scripts/bacula-dir.conf.testrunscript
 sed -f ${out} ${cwd}/scripts/bacula-dir-faketape.conf.in >${cwd}/scripts/bacula-dir-faketape.conf
 sed -f ${out} ${cwd}/scripts/bacula-sd-faketape.conf.in >${cwd}/scripts/bacula-sd-faketape.conf
-sed -f ${out} ${cwd}/scripts/prepare-big-autochanger.in >${cwd}/scripts/prepare-big-autochanger
+sed -f ${out} ${cwd}/scripts/prepare-fake-autochanger.in >${cwd}/scripts/prepare-fake-autochanger
 sed -f ${out} ${cwd}/scripts/tls-bacula-fd.conf.in >${cwd}/scripts/tls-bacula-fd.conf
 sed -f ${out} ${cwd}/scripts/tls-bacula-sd.conf.in >${cwd}/scripts/tls-bacula-sd.conf
 sed -f ${out} ${cwd}/scripts/tls-bacula-dir.conf.in >${cwd}/scripts/tls-bacula-dir.conf
diff --git a/regress/scripts/prepare-big-autochanger.in b/regress/scripts/prepare-big-autochanger.in
deleted file mode 100644
index 97dadf7abc..0000000000
--- a/regress/scripts/prepare-big-autochanger.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# This script will prepare a big dummy autochanger 
-#
-
-. scripts/functions
-
-# check if user wants to run this test
-if test x$USE_FAKETAPE = x; then
-    exit 1
-fi
-
-adir=@working_dir@/ach
-
-mkdir $adir 2> /dev/null
-rm -f $adir/log $adir/barcodes $adir/slot* $adir/drive* 2> /dev/null
-
-# create the autochanger configuration file
-cat > $adir/conf <<EOF
-maxdrive=8
-maxslot=80
-dbgfile=$adir/log
-EOF
-
-# turn on ach debug
-touch $adir/log
-
-# create 75 volumes
-for i in `seq 1 75`; do
-    echo $i:vol$i >> $adir/barcodes
-    cp /dev/null $adir/slot$i
-done
-
-# make a cleaning tape
-echo 76:CLN01 >> $adir/barcodes
-cp /dev/null $adir/slot76
-
-# keep other empty
-for i in `seq 77 79`; do
-    echo $i:  >> $adir/barcodes
-done
-
diff --git a/regress/scripts/prepare-fake-autochanger.in b/regress/scripts/prepare-fake-autochanger.in
new file mode 100644
index 0000000000..799dbd2f3f
--- /dev/null
+++ b/regress/scripts/prepare-fake-autochanger.in
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# This script will prepare a big dummy autochanger 
+#
+
+. scripts/functions
+
+# check if user wants to run this test
+if test x$USE_FAKETAPE = x; then
+    exit 1
+fi
+
+adir=@working_dir@/ach
+
+mkdir $adir 2> /dev/null
+rm -f $adir/log $adir/barcodes $adir/load* $adir/slot* $adir/drive* 2> /dev/null
+
+# create the autochanger configuration file
+cat > $adir/conf <<EOF
+maxdrive=8
+maxslot=80
+dbgfile=$adir/log
+EOF
+
+# turn on ach debug
+touch $adir/log
+
+# create 75 volumes
+for i in `seq 1 75`; do
+    echo $i:vol$i >> $adir/barcodes
+    cp /dev/null $adir/slot$i
+done
+
+# make a cleaning tape
+echo 76:CLN01 >> $adir/barcodes
+cp /dev/null $adir/slot76
+
+# keep other empty
+for i in `seq 77 79`; do
+    echo $i:  >> $adir/barcodes
+done
+
diff --git a/regress/tests/faketape-test-changer b/regress/tests/faketape-test-changer
index 8e5e2f0896..665aa809a0 100755
--- a/regress/tests/faketape-test-changer
+++ b/regress/tests/faketape-test-changer
@@ -21,7 +21,7 @@ scripts/cleanup
 scripts/copy-tape-confs
 cp scripts/bacula-dir-faketape.conf bin/bacula-dir.conf
 cp scripts/bacula-sd-faketape.conf bin/bacula-sd.conf
-scripts/prepare-big-autochanger
+scripts/prepare-fake-autochanger
 
 echo "${cwd}/build" >${cwd}/tmp/file-list