From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sat, 21 Jun 2008 19:40:09 +0000 (+0000)
Subject: ebl  revert to last version to find something more clean with vtape
X-Git-Tag: Release-7.0.0~4407
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f8b590097d2779cb2bf497ae81de8419f3734c1a;p=bacula%2Fbacula

ebl  revert to last version to find something more clean with vtape


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

diff --git a/regress/tests/two-vol-manual-tape b/regress/tests/two-vol-manual-tape
index 0eae8e2ed9..888cfd81f4 100755
--- a/regress/tests/two-vol-manual-tape
+++ b/regress/tests/two-vol-manual-tape
@@ -11,10 +11,34 @@ JobName=twovolmanualtape
 require_tape_drive
 require_autochanger
 
-scripts/cleanup-tape
+scripts/cleanup
 scripts/copy-tape-confs
 echo "${cwd}/build" >${cwd}/tmp/file-list
 
+# Get a tape in the drive either from slot 1 or slot 2
+slot=`bin/mtx-changer ${AUTOCHANGER} loaded 0 ${TAPE_DRIVE} $DRIVE1`
+case $slot in
+ 0)
+    bin/mtx-changer ${AUTOCHANGER} load $SLOT1 ${TAPE_DRIVE} $DRIVE1
+    slot=$SLOT1
+    ;;
+ $SLOT1)
+    slot=$SLOT1
+    ;;
+ $SLOT2)
+    slot=$SLOT2
+    ;;
+ default)
+    mt -f ${TAPE_DRIVE} rewind                
+    bin/mtx-changer ${AUTOCHANGER} unload $slot ${TAPE_DRIVE} $DRIVE1
+    bin/mtx-changer ${AUTOCHANGER} load $SLOT1 ${TAPE_DRIVE} $DRIVE1
+    slot=$SLOT1
+    ;;
+esac
+mt -f ${TAPE_DRIVE} rewind
+mt -f ${TAPE_DRIVE} weof
+
+
 change_jobname $JobName
 start_test