Replace --archivedir with --with-archivedir

[bacula/bacula] / regress / scripts / cleanup-2tape.in

diff --git a/regress/scripts/cleanup-2tape.in b/regress/scripts/cleanup-2tape.in
index 06583b5f69fa00115ac1ac998ecef738a55a9909..0f33ec95c7992c3f47cfba7969da2197118d2609 100755 (executable)
--- a/regress/scripts/cleanup-2tape.in
+++ b/regress/scripts/cleanup-2tape.in
@@ -2,15 +2,13 @@
 #
 # Cleanup left over files -- both before and after test run
 #
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores /tmp/Small*
-rm -rf tmp/original tmp/bacula-restores tmp/Small* tmp/TestVolume*
-rm -rf tmp/restored tmp/largefile tmp/bscan.bsr tmp/log*.out
+scripts/cleanup
 
-if ! test x@autochanger@ = x/dev/null; then
-   drive=`bin/mtx-changer @autochanger@ loaded`
-   if ! test x$drive = x2; then
-      bin/mtx-changer @autochanger@ unload
-      bin/mtx-changer @autochanger@ load 2
+if test x@autochanger@ != x/dev/null; then
+   drive=`bin/mtx-changer @autochanger@ loaded 0 dummy 0`
+   if test x${drive} != x2; then
+      bin/mtx-changer @autochanger@ unload 0 @tape_drive@ 0
+      bin/mtx-changer @autochanger@ load 2 @tape_drive@ 0
    fi
    mt -f @tape_drive@ rewind
    mt -f @tape_drive@ weof
@@ -20,11 +18,11 @@ fi
 #
 # If we have an autochanger always load tape in slot 1
 #
-if ! test x@autochanger@ = x/dev/null; then
-   drive=`bin/mtx-changer @autochanger@ loaded`
-   if ! test x$drive = x1; then
-      bin/mtx-changer @autochanger@ unload
-      bin/mtx-changer @autochanger@ load 1
+if test x@autochanger@ != x/dev/null; then
+   drive=`bin/mtx-changer @autochanger@ loaded 0 dummy 0`
+   if test x${drive} != x1; then
+      bin/mtx-changer @autochanger@ unload 0 @tape_drive@ 0
+      bin/mtx-changer @autochanger@ load 1 @tape_drive@ 0
    fi
 fi