X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fdifferential-test;h=7ef57dc220a09c54b04d05d1e05ac841640f57fd;hb=414ee85d83197d4f61499f9542455695fa7da276;hp=4949bfe6d8e508474a12df99513c0efe7881371e;hpb=6a8eafaf4e7f1224125927475704534694ad4cd0;p=bacula%2Fbacula

diff --git a/regress/tests/differential-test b/regress/tests/differential-test
index 4949bfe6d8..7ef57dc220 100755
--- a/regress/tests/differential-test
+++ b/regress/tests/differential-test
@@ -6,11 +6,10 @@
 TestName="differential-test"
 JobName=differential
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-test-confs
-echo "${cwd}/tmp/build" >/tmp/file-list
+echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 mkdir ${cwd}/tmp/build
 cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build
 cd ${cwd}/tmp
@@ -21,10 +20,10 @@ cd ${cwd}
 change_jobname CompressedTest $JobName
 start_test
 
-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
 label storage=File volume=TestVolume002
 label storage=File volume=TestVolume001
 run job=$JobName yes
@@ -39,10 +38,10 @@ scripts/check_for_zombie_jobs storage=File
 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
 @$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 @# Force differential on the second Volume
 update volume=TestVolume002 VolStatus=Used
 run level=differential job=$JobName yes
@@ -56,17 +55,17 @@ run_bconsole
 scripts/check_for_zombie_jobs storage=File
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
 
-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 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=File file=<${cwd}/tmp/restore-list
 yes
 wait
@@ -83,6 +82,6 @@ check_two_logs
 #
 # Delete .c files because we will only restore the txt files
 #
-rm -f tmp/build/*.c
+rm -f ${cwd}/tmp/build/*.c
 check_restore_tmp_build_diff
 end_test