X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fdifferential-test;h=4d95637a5898d786f25c73a3ac39e3cf63a17f0e;hb=3448d94ab63e631f378fa674240b98133c9a5d29;hp=80c9d692485ff8a4028a1bd6b57df5d682740232;hpb=5b4f40e5baaa8cbba795741f60488e464fddea1e;p=bacula%2Fbacula

diff --git a/regress/tests/differential-test b/regress/tests/differential-test
index 80c9d69248..4d95637a58 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/copy-test-confs
 scripts/cleanup
-echo "${cwd}/tmp/build" >/tmp/file-list
+scripts/copy-test-confs
+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
@@ -18,15 +17,17 @@ echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list
 echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list
 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
+setdebug level=100 storage=File
 label storage=File volume=TestVolume002
 label storage=File volume=TestVolume001
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 quit
@@ -38,13 +39,13 @@ 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=CompressedTest yes
+run level=differential job=$JobName yes
 wait
 messages
 @$out
@@ -55,17 +56,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
-run level=incremental job=CompressedTest yes
+@$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
@@ -82,6 +83,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