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

diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test
index 631ec549d4..0b85a90fa0 100755
--- a/regress/tests/auto-label-test
+++ b/regress/tests/auto-label-test
@@ -6,28 +6,27 @@
 TestName="auto-label-test"
 JobName=AutoLabel
 . scripts/functions
-set_debug 1
 
-cwd=`pwd`
-scripts/copy-test-confs
-scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
+copy_test_confs
+
+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
 
+change_jobname CompressedTest $JobName
 start_test
 
-cat <<END_OF_DATA >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
 messages
 @#setdebug level=110 storage=File
-run job=CompressedTest storage=File yes
+run job=$JobName storage=File yes
 list pools
 list volumes
 wait
@@ -35,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 *
@@ -54,10 +53,10 @@ wait
 messages
 @$out
 quit
-END_OF_DATA
+END_OF_SCRIPT
 
 run_bacula
-check_for_zombie_jobs storage=File
+check_for_zombie_jobs storage=File || exit 1
 stop_bacula
 
 check_two_logs