regress: add function to create many dirs

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

diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape
index f1616283125165fa8c506dffa54cb6c17da0f077..198834f6e5758186a60e59898aca82cae4d6e15a 100755 (executable)
--- a/regress/tests/incremental-tape
+++ b/regress/tests/incremental-tape
@@ -3,15 +3,18 @@
 # Run a simple backup of the Bacula build directory then create some           
 #   new files, do an Incremental and restore those two files.
 #
-TestName="incremental-1t1d-tape"
+TestName="incremental-tape"
 JobName=IncTape
 . scripts/functions
 
-copy_tape_confs
+require_tape_drive
+
+scripts/copy-tape-confs
+scripts/cleanup-tape
 
 echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 if test ! -d ${cwd}/tmp/build ; then
-   mkdir ${cwd}/tmp/build
+   mkdir -p ${cwd}/tmp/build
 fi
 cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build
 cd ${cwd}/tmp
@@ -23,10 +26,10 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out   ${cwd}/tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
+label storage=tape volume=TestVolume001 slot=0 pool=Default
 run job=$JobName yes
 wait
 messages
@@ -34,13 +37,13 @@ quit
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out   ${cwd}/tmp/log1.out
 run level=Incremental job=$JobName yes
@@ -50,19 +53,18 @@ messages
 @# now do a restore
 @#
 @$out   ${cwd}/tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores storage=DDS-4
+restore where=${cwd}/tmp/bacula-restores storage=tape
 7
 <${cwd}/tmp/restore-list
 
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA
 
 run_bconsole
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 #