regress: add function to create many dirs

[bacula/bacula] / regress / tests / four-jobs-test

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index ca56c665ce052014ce270e3b5dac32c3ea785175..c57d38c774961ef0ff91f855c79e26bd57f7e92f 100755 (executable)
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -7,23 +7,21 @@
 TestName="four-jobs-test"
 JobName=SpanVol
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
-scripts/copy-test-confs
 scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname CompressedTest $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
-estimate job=$JobName listing
-estimate job=$JobName listing
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 estimate job=$JobName listing
+estimate job=$JobName
+estimate job=$JobName
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
@@ -33,7 +31,6 @@ END_OF_DATA
 
 run_bacula
 check_for_zombie_jobs storage=File
-echo "Backup 1 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
@@ -41,12 +38,11 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a second job
 #
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@$out  tmp/log1.out
-run job=$JobName
-yes
+@$out  ${cwd}/tmp/log1.out
+run job=$JobName yes
 wait
 messages
 quit
@@ -55,17 +51,15 @@ END_OF_DATA
 run_bconsole
 check_for_zombie_jobs storage=File
 
-echo "Backup 2 done"
 touch ${cwd}/build/src/dird/*.c
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a third job
 #
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@output tmp/log1.out
-label storage=File volume=TestVolume001
+@$out ${cwd}/tmp/log1.out
 run job=$JobName yes
 wait
 messages
@@ -75,17 +69,15 @@ END_OF_DATA
 run_bconsole
 check_for_zombie_jobs storage=File
 
-echo "Backup 3 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a fourth job
 #
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@output tmp/log1.out
-label storage=File volume=TestVolume001
+@$out ${cwd}/tmp/log1.out
 run job=$JobName yes
 wait
 messages
@@ -95,19 +87,18 @@ END_OF_DATA
 run_bconsole
 check_for_zombie_jobs storage=File
 
-echo "Backup 4 done"
 # 
 # now do several restores to ensure we cleanup between jobs
 #
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
 restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -115,13 +106,12 @@ done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA
 
 run_bconsole
 check_for_zombie_jobs storage=File
-bacula_stop
+stop_bacula
 
 check_two_logs
 check_restore_diff