regress: add function to create many dirs

[bacula/bacula] / regress / tests / query-test

diff --git a/regress/tests/query-test b/regress/tests/query-test
index 64bf87ce70903ee9c763a39b21a52ae4fcbd03d8..2a3868d0a459190874437384a6156ff8d400c8fe 100755 (executable)
--- a/regress/tests/query-test
+++ b/regress/tests/query-test
@@ -11,7 +11,7 @@ JobName=query
 scripts/cleanup
 scripts/copy-test-confs
 echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
-mkdir ${cwd}/tmp/build
+mkdir -p ${cwd}/tmp/build
 cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build
 cd ${cwd}/tmp
 echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list
@@ -22,11 +22,11 @@ change_jobname CompressedTest $JobName
 start_test
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
-label storage=File volume=TestVolume002 pool=Default
+label storage=File volume=TestVolume001
+label storage=File volume=TestVolume002
 run job=$JobName yes
 wait
 messages
@@ -41,7 +41,7 @@ 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
 @# Force differental on the second Volume
@@ -49,7 +49,6 @@ update volume=TestVolume001 VolStatus=Used
 run level=differental job=$JobName yes
 wait
 messages
-@output
 END_OF_DATA
 
 run_bacula
@@ -58,7 +57,7 @@ stop_bacula
 
 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
@@ -102,7 +101,6 @@ restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-l
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA