X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fauto-label-test;h=0b85a90fa076f4578a024284bfb0974bb98ac72b;hb=1e11e29bf661a26cef2419a31d82b6657370f0af;hp=6583937e0364134bb1ec1325088f8139170bbfd4;hpb=7536ad5ca65a3bde880d0890b942be653a6ad631;p=bacula%2Fbacula

diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test
index 6583937e03..0b85a90fa0 100755
--- a/regress/tests/auto-label-test
+++ b/regress/tests/auto-label-test
@@ -6,10 +6,10 @@
 TestName="auto-label-test"
 JobName=AutoLabel
 . scripts/functions
-set_debug 0
+
 copy_test_confs
 
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
 sed "s%# Label Format%  Label Format%" ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
@@ -17,10 +17,10 @@ sed "s%# Label Format%  Label Format%" ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
 change_jobname CompressedTest $JobName
 start_test
 
-cat <<END_OF_SCRIPT >tmp/bconcmds
+cat <<END_OF_SCRIPT >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 status all
 status all
 list pools
@@ -34,7 +34,7 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -56,7 +56,7 @@ quit
 END_OF_SCRIPT
 
 run_bacula
-check_for_zombie_jobs storage=File
+check_for_zombie_jobs storage=File || exit 1
 stop_bacula
 
 check_two_logs