Reorganize regex code

[bacula/bacula] / regress / tests / incremental-2media-tape

diff --git a/regress/tests/incremental-2media-tape b/regress/tests/incremental-2media-tape
index 65014880f827dd4e660a05202e4926a0740c4eda..0c3f1ca732943b5f872b344881a666183c096957 100755 (executable)
--- a/regress/tests/incremental-2media-tape
+++ b/regress/tests/incremental-2media-tape
@@ -10,6 +10,8 @@ TestName="incremental-2media-tape"
 JobName=Inc2mediaTape
 . scripts/functions
 
+require_tape_drive
+require_second_drive
 
 scripts/cleanup
 # Get conf files
@@ -39,7 +41,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
+label storage=tape volume=TestVolume001 slot=$SLOT1 Pool=Default drive=$DRIVE1
 label storage=DLT80 volume=TestVolume002 Pool=Default
 run job=$JobName yes
 wait
@@ -69,12 +71,11 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out
-setdebug level=51 storage=DDS-4
+setdebug level=51 storage=tape
 restore where=${cwd}/tmp/bacula-restores select all done 
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA