X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fetc-test-root;h=9ba0b1105ca9e4ff704ddbcdcb717b05fb0bb150;hb=8ee711f2e7b445b00de916f5712c59749afc2407;hp=2c5e24a1db17336cc0e57fd2e4ba9c462222a21b;hpb=f2d751f02f74eda51a548adb208076d9684a7df2;p=bacula%2Fbacula

diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root
index 2c5e24a1db..9ba0b1105c 100755
--- a/regress/tests/etc-test-root
+++ b/regress/tests/etc-test-root
@@ -8,14 +8,14 @@ TestName="etc-test-root"
 
 scripts/cleanup
 scripts/copy-test-confs
-echo "/etc" >/tmp/file-list
+echo "/etc" >${cwd}/tmp/file-list
 
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@output tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=File
 TestVolume001
 run job=NightlySave
@@ -25,7 +25,7 @@ messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select    
 unmark *
 mark *
@@ -33,7 +33,6 @@ done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA
 
@@ -51,7 +50,7 @@ sort <${cwd}/tmp/1 >${cwd}/tmp/original
 sort <${cwd}/tmp/2 >${cwd}/tmp/restored
 rm -f ${cwd}/tmp/1 ${cwd}/tmp/2
 cd ${cwd}
-diff tmp/original tmp/restored 2>&1 1>/dev/null
+diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 1>/dev/null
 if [ $? != 0 ] ; then
    echo " "
    echo " "