X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fincremental-tape;h=38e8347b681fdff93f302c9859368cae22a5936e;hb=9d3109a03bb69d2ef5bf39f2cbe424cf9fc2076d;hp=3b7264da77d382bed732f6b2dd2c01de35e06ff2;hpb=846585b2a47f5ef0e1360476120960dcea4cb6e9;p=bacula%2Fbacula

diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape
index 3b7264da77..38e8347b68 100755
--- a/regress/tests/incremental-tape
+++ b/regress/tests/incremental-tape
@@ -6,11 +6,13 @@
 TestName="incremental-tape"
 JobName=IncTape
 . scripts/functions
-set_debug 0
 
-copy_tape_confs
+require_tape_drive
 
-echo "${cwd}/tmp/build" >/tmp/file-list
+scripts/copy-tape-confs
+scripts/cleanup-tape
+
+echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 if test ! -d ${cwd}/tmp/build ; then
    mkdir ${cwd}/tmp/build
 fi
@@ -23,10 +25,10 @@ cd ${cwd}
 change_jobname NightlySave $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 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
@@ -40,17 +42,17 @@ check_for_zombie_jobs storage=DDS-4
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out   tmp/log1.out
+@$out   ${cwd}/tmp/log1.out
 run level=Incremental job=$JobName yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-@$out   tmp/log2.out
+@$out   ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores storage=DDS-4
 7
 <${cwd}/tmp/restore-list
@@ -69,7 +71,7 @@ stop_bacula
 #
 # Delete .c files because we will only restored the txt files
 #
-rm -f tmp/build/*.c
+rm -f ${cwd}/tmp/build/*.c
 
 check_two_logs
 check_restore_tmp_build_diff