regress: add function to create many dirs

[bacula/bacula] / regress / tests / incremental-2disk

diff --git a/regress/tests/incremental-2disk b/regress/tests/incremental-2disk
index 1c1efb4c0005c7f9d9b9ede5f6af95243333d911..b4bf8292d0f2be848ca5be1d28c3a0b617a436cf 100755 (executable)
--- a/regress/tests/incremental-2disk
+++ b/regress/tests/incremental-2disk
@@ -9,20 +9,13 @@ TestName="incremental-2disk"
 JobName=Inc2disk
 . scripts/functions
 
-
-stop_bacula
-cd bin
-./drop_bacula_tables >/dev/null 2>&1
-./make_bacula_tables >/dev/null 2>&1
-./grant_bacula_privileges 2>&1 >/dev/null
-cd ..
-
+scripts/cleanup
 scripts/copy-2disk-confs
 scripts/prepare-disk-changer
 
 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
@@ -38,8 +31,8 @@ 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=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=0
+label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=0
+label storage=tape volume=TestVolume002 slot=2 Pool=Default drive=0
 run job=$JobName yes
 wait
 messages
@@ -72,7 +65,6 @@ restore where=${cwd}/tmp/bacula-restores
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA