From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 4 Jan 2008 18:33:00 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-7.0.0~5176
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=41a380a0d6508c6aaf827f198601da84925e54b1;p=bacula%2Fbacula

Update

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

diff --git a/regress/scripts/functions b/regress/scripts/functions
index 798bc0a786..656b731733 100644
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -25,6 +25,14 @@ if [ $MUID != 0 ] ; then
 fi
 }
 
+skip_if_no_autochanger()
+{
+if test x${AUTOCHANGER} = x/dev/null ; then
+   echo "$TestName test skipped. No autochanger."
+   exit
+fi
+
+}
 
 set_debug()
 {
diff --git a/regress/tests/two-pool-2t1da-tape b/regress/tests/two-pool-2t1da-tape
index 8e635acaad..b90634f0b7 100755
--- a/regress/tests/two-pool-2t1da-tape
+++ b/regress/tests/two-pool-2t1da-tape
@@ -11,10 +11,7 @@ TestName="two-pool-2t1da-tape"
 JobName=twopooltape
 . scripts/functions
 
-if test x${AUTOCHANGER} = x/dev/null ; then
-   echo "${TestName} test skipped. No autochanger."
-   exit
-fi
+skip_if_no_autochanger
 
 scripts/cleanup
 scripts/copy-2tape-confs
diff --git a/regress/tests/vol-duration-2t1da-tape b/regress/tests/vol-duration-2t1da-tape
index 55f1d284d5..0a5ca900da 100755
--- a/regress/tests/vol-duration-2t1da-tape
+++ b/regress/tests/vol-duration-2t1da-tape
@@ -13,7 +13,7 @@ TestName="vol-duration-2t1da-tape"
 JobName=VolDuration
 . scripts/functions
 
-skip_if_not_autochanger
+skip_if_no_autochanger
 
 scripts/cleanup
 scripts/copy-2tape-confs