regress: Fix win32-fd-test

[bacula/bacula] / regress / tests / differential-test

diff --git a/regress/tests/differential-test b/regress/tests/differential-test
index 652a66a6c1381cdc8cfbfd734525367980cfd1dc..898147dfc20b07367aa51ec3bdf31fd897c0c057 100755 (executable)
--- a/regress/tests/differential-test
+++ b/regress/tests/differential-test
@@ -6,12 +6,11 @@
 TestName="differential-test"
 JobName=differential
 . scripts/functions
-set_debug 0
 
-scripts/copy-test-confs
 scripts/cleanup
-echo "${cwd}/tmp/build" >/tmp/file-list
-mkdir ${cwd}/tmp/build
+scripts/copy-test-confs
+echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
+mkdir -p ${cwd}/tmp/build
 cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build
 cd ${cwd}/tmp
 echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list
@@ -21,10 +20,11 @@ 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=$JobName yes
@@ -39,16 +39,15 @@ 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
 wait
 messages
-@$out
 END_OF_DATA
 
 run_bconsole
@@ -56,22 +55,21 @@ 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
 messages
-@$out
 quit
 END_OF_DATA
 
@@ -83,6 +81,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