ebl update cancel test

[bacula/bacula] / regress / tests / sparse-encrypt-test

diff --git a/regress/tests/sparse-encrypt-test b/regress/tests/sparse-encrypt-test
index a3c9a6fce02f347a16c35e6d7457631c689d4799..865b739b49da841a6ab528cf4605870b4641a377 100755 (executable)
--- a/regress/tests/sparse-encrypt-test
+++ b/regress/tests/sparse-encrypt-test
@@ -5,11 +5,10 @@
 TestName="sparse-encrypt-test"
 JobName=Crypto
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-crypto-confs
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 cd ${cwd}/build/src/tools
 ./gigaslam
 if [ $? != 0 ]; then
@@ -19,12 +18,13 @@ if [ $? != 0 ]; then
 fi
 cd ${cwd}
 
+change_jobname SparseTest $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
 label storage=File volume=TestVolume001
 setdebug level=10 fd
 run job=$JobName yes
@@ -34,7 +34,7 @@ list volumes
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 @# setdebug level=0 fd
 restore where=${cwd}/tmp/bacula-restores storage=File
 5
@@ -67,4 +67,4 @@ check_two_logs
 check_restore_diff
 end_test
 rm -f ${cwd}/build/src/tools/gigaslam.gif
-rm -r ${cwd}/build/gigaslam.gif
+rm -f ${cwd}/build/gigaslam.gif