From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 5 Jul 2008 13:22:29 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-2.4.1~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b799c1ba05e80c2ca12379567580190f51948104;p=bacula%2Fbacula

Update

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7318 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/regress/tests/two-pool-tape b/regress/tests/two-pool-tape
index 275f9f0d23..c79496f741 100755
--- a/regress/tests/two-pool-tape
+++ b/regress/tests/two-pool-tape
@@ -11,10 +11,8 @@ TestName="two-pool-tape"
 JobName=twopooltape
 . scripts/functions
 
-if test x${AUTOCHANGER} = x/dev/null ; then
-   echo "two-pool-tape test skipped. No autochanger."
-   exit
-fi
+require_tape_drive
+require_autochanger
 
 scripts/cleanup
 scripts/copy-2tape-confs
@@ -22,12 +20,10 @@ echo "Prepare two tapes"
 scripts/prepare-two-tapes
 echo "Done prepare two tapes"
  
-# Make a relatively large backup set 5 x source code directory
+# Make a relatively large backup set 3 x source code directory
 echo "${cwd}/build" >${cwd}/tmp/file-list
 echo "${cwd}/build" >>${cwd}/tmp/file-list
 echo "${cwd}/build" >>${cwd}/tmp/file-list
-echo "${cwd}/build" >>${cwd}/tmp/file-list
-echo "${cwd}/build" >>${cwd}/tmp/file-list
 
 start_test