X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ffour-jobs-tape;h=ff579c09a009a2616dda07176f422c52c1873ea6;hb=28b32f20b7278613564755efe4ac7800fcb89bf0;hp=e95b1b761774e66b05d404cf8c2e24d90c4f8458;hpb=45dc0d2f1f568fcc62526533adacde65df441837;p=bacula%2Fbacula

diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape
index e95b1b7617..ff579c09a0 100755
--- a/regress/tests/four-jobs-tape
+++ b/regress/tests/four-jobs-tape
@@ -8,20 +8,22 @@ TestName="four-jobs-tape"
 JobName=fourjobstape
 . scripts/functions
 
+require_tape_drive
+
 scripts/cleanup-tape
 scripts/copy-tape-confs
-echo "${cwd}/build" >/tmp/file-list
+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
+estimate job=$JobName
+estimate job=$JobName
 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
@@ -30,10 +32,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
@@ -45,10 +47,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
@@ -56,10 +58,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
@@ -69,10 +71,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
@@ -80,10 +82,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
@@ -93,10 +95,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
@@ -104,10 +106,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
@@ -115,7 +117,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
@@ -123,7 +125,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