Update

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

diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape
index 449f74275a4b1fb9e58047563b35a56e10aa1b02..6d07d5317129463818ba7d5245f497d8d352e5fb 100755 (executable)
--- a/regress/tests/four-jobs-tape
+++ b/regress/tests/four-jobs-tape
@@ -7,22 +7,21 @@
 TestName="four-jobs-tape"
 JobName=fourjobstape
 . scripts/functions
-set_debug 0
 
-scripts/copy-tape-confs
 scripts/cleanup-tape
-echo "${cwd}/build" >/tmp/file-list
+scripts/copy-tape-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 estimate job=$JobName listing
 estimate job=$JobName listing
 estimate job=$JobName listing
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=$JobName yes
 wait
@@ -31,10 +30,10 @@ quit
 END_OF_DATA
 if test "$debug" -eq 1 ; then
   bin/bacula start
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
+  cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
 else
   bin/bacula start 2>&1 >/dev/null
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
+  cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
 fi
 
 scripts/check_for_zombie_jobs storage=DDS-4
@@ -46,10 +45,10 @@ 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
 @$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 run job=$JobName level=Incremental yes
 wait
 messages
@@ -57,10 +56,10 @@ quit
 END_OF_DATA
 if test "$debug" -eq 1 ; then
   bin/bacula start
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
+  cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
 else
   bin/bacula start 2>&1 >/dev/null
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
+  cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
 fi
 
 scripts/check_for_zombie_jobs storage=DDS-4
@@ -70,10 +69,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
 @$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 run job=$JobName level=Incremental yes
 wait
 messages
@@ -81,10 +80,10 @@ quit
 END_OF_DATA
 if test "$debug" -eq 1 ; then
   bin/bacula start
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
+  cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
 else
   bin/bacula start 2>&1 >/dev/null
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
+  cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
 fi
 
 scripts/check_for_zombie_jobs storage=DDS-4
@@ -94,10 +93,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
 @$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 run job=$JobName level=Incremental yes
 wait
 messages
@@ -105,10 +104,10 @@ quit
 END_OF_DATA
 if test "$debug" -eq 1 ; then
   bin/bacula start
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
+  cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
 else
   bin/bacula start 2>&1 >/dev/null
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
+  cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
 fi
 
 scripts/check_for_zombie_jobs storage=DDS-4
@@ -116,7 +115,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
 @$out /dev/null
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
@@ -124,7 +123,7 @@ wait
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 @#
 @# now unmount the tape and start two restores
 @#  at the same time