X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fquery-test;h=a4d365e1fe5e9a9046fba14d3eb159d92ac569af;hb=86e786f4fb2faf7c9487a0bf4633371cbb57b759;hp=5f2f057ed7d167bad549db932a5e3b2505048ef3;hpb=5fcf90dff3408e1f14722a222042ba36b952065f;p=bacula%2Fbacula

diff --git a/regress/tests/query-test b/regress/tests/query-test
index 5f2f057ed7..a4d365e1fe 100755
--- a/regress/tests/query-test
+++ b/regress/tests/query-test
@@ -7,11 +7,10 @@
 TestName="query-test"
 JobName=query
 . 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
@@ -22,10 +21,10 @@ cd ${cwd}
 change_jobname CompressedTest $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=File volume=TestVolume001
 label storage=File volume=TestVolume002
 run job=$JobName yes
@@ -36,14 +35,15 @@ END_OF_DATA
 
 run_bacula
 check_for_zombie_jobs storage=File
+stop_bacula
 
 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
 @# Force differental on the second Volume
 update volume=TestVolume001 VolStatus=Used
 run level=differental job=$JobName yes
@@ -54,12 +54,13 @@ END_OF_DATA
 
 run_bacula
 check_for_zombie_jobs storage=File
+stop_bacula
 
 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
@@ -96,7 +97,7 @@ query
 @# 
 @# 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
@@ -112,7 +113,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