Fail tests requiring tape drive if none present

[bacula/bacula] / regress / tests / 2drive-incremental-2t2da-tape

diff --git a/regress/tests/2drive-incremental-2t2da-tape b/regress/tests/2drive-incremental-2t2da-tape
index 613d4a2ba38f2d935a6ad7758652723405c83a39..fd09b9b21f878e0dedd5ec3c3bb781bdd1b7a01d 100755 (executable)
--- a/regress/tests/2drive-incremental-2t2da-tape
+++ b/regress/tests/2drive-incremental-2t2da-tape
@@ -3,17 +3,15 @@
 # Run a simple backup of the Bacula build directory then create some           
 #   new files, do an Incremental and restore those two files.
 #
-# This script uses the autochanger and two tapes
+# This script uses the autochanger and two drives
 #
 TestName="2drive-incremental-2t2da-tape"
 JobName="2drive2tape"
 . scripts/functions
 
-if test x${TAPE_DRIVE1} = x/dev/null ; then
-   echo "Skipping 2drive-incremental-2tape test. No second drive."
-   exit
-fi
-
+require_tape_drive
+require_autochanger
+require_second_drive
 
 scripts/copy-2drive-confs
 scripts/cleanup-2drive