X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ffour-jobs-test;h=b13a3ddd930e20ecbcdea2a35625640d1eb22ca3;hb=e5ef682130f94d5afa513a28cea931bf55220884;hp=ca56c665ce052014ce270e3b5dac32c3ea785175;hpb=7536ad5ca65a3bde880d0890b942be653a6ad631;p=bacula%2Fbacula

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index ca56c665ce..b13a3ddd93 100755
--- 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
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 estimate job=$JobName listing
-estimate job=$JobName listing
-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
@@ -41,12 +39,11 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a second job
 #
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out  tmp/log1.out
-run job=$JobName
-yes
+@$out  ${cwd}/tmp/log1.out
+run job=$JobName yes
 wait
 messages
 quit
@@ -61,11 +58,10 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a third job
 #
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@output tmp/log1.out
-label storage=File volume=TestVolume001
+@output ${cwd}/tmp/log1.out
 run job=$JobName yes
 wait
 messages
@@ -81,11 +77,10 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a fourth job
 #
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@output tmp/log1.out
-label storage=File volume=TestVolume001
+@output ${cwd}/tmp/log1.out
 run job=$JobName yes
 wait
 messages
@@ -99,7 +94,7 @@ echo "Backup 4 done"
 # 
 # now do several restores to ensure we cleanup between jobs
 #
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
@@ -107,7 +102,7 @@ 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 *
@@ -121,7 +116,7 @@ END_OF_DATA
 
 run_bconsole
 check_for_zombie_jobs storage=File
-bacula_stop
+stop_bacula
 
 check_two_logs
 check_restore_diff