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 798bc0a786721ae385fd7dca179c4244554b5f56..656b7317338cc25c6937375794cfc803be04b3e3 100644 (file)
--- 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 8e635acaad79f35cca211f88adfbd60756e5173b..b90634f0b70c54a76f706430dc897f3e196f2adc 100755 (executable)
--- 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 55f1d284d54b4eaec55dd0d8c1081b08e13bd24d..0a5ca900daa69f0d73e52ea55abf139888933754 100755 (executable)
--- 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