Reduce wait time in regression RunScripts

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

diff --git a/regress/scripts/cleanup-2tape.in b/regress/scripts/cleanup-2tape.in
index 70e6b7b0f00602f069e2a508da5dc51977010e27..8fa197d4df7b2e0b6ca71afec068f9dccd7a1a1a 100755 (executable)
--- a/regress/scripts/cleanup-2tape.in
+++ b/regress/scripts/cleanup-2tape.in
@@ -2,29 +2,8 @@
 #
 # Cleanup left over files -- both before and after test run
 #
-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
-   fi
-   mt -f @tape_drive@ rewind
-   mt -f @tape_drive@ weof
-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
-   fi
-fi
+. scripts/functions
 
-mt -f @tape_drive@ rewind
-mt -f @tape_drive@ weof
+scripts/cleanup
+scripts/prepare-two-tapes