X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fsix-vol-test;h=bebf0dd61b286c8688f8fa615d114a5885b2c161;hb=8677704f2830dc4973ab0eaef0066f7f44f06ccb;hp=a925ff94e56281f15ed059c56b50b33249172c4c;hpb=16e2e3b9d4b47267e5fcbf632f52ade5b8ae6692;p=bacula%2Fbacula

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index a925ff94e5..bebf0dd61b 100755
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -17,20 +17,20 @@ scripts/copy-testa-confs
 # copy special conf file
 /bin/cp -f scripts/testb-bacula-dir.conf bin/bacula-dir.conf
 
-echo "${cwd}/tmp/largefile" >/tmp/file-list
+echo "${cwd}/tmp/largefile" >${cwd}/tmp/file-list
 # Create 56MB file with random data
 echo "Creating a 56MB file with random data ..."
-dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000
+dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000 >/dev/null 2>&1
 echo "largefile created"
 
 change_jobname MultiVol $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
-@#setdebug level=50 storage=File
+@$out ${cwd}/tmp/log1.out
+setdebug level=150 storage=File
 run job=$JobName storage=File yes
 run job=$JobName storage=File yes
 run job=$JobName storage=File yes
@@ -42,12 +42,12 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 sql
 select * from JobMedia where JobId=4;
 select * from JobMedia where JobId=5;
 
-@#setdebug level=50 storage=File
+setdebug level=150 storage=File
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -64,6 +64,6 @@ check_for_zombie_jobs storage=File
 stop_bacula
 
 check_two_logs
-diff tmp/largefile  tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null
+diff ${cwd}/tmp/largefile  ${cwd}/tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null
 dstat=$?
 end_test