Merge branch 'master' into basejobv3

[bacula/bacula] / regress / tests / dev-test-root

diff --git a/regress/tests/dev-test-root b/regress/tests/dev-test-root
index 66728d646b30075fcf3b70dbbb0d76c67801617e..838d5d1028b02323c2480e14d602f63ffb498b55 100755 (executable)
--- a/regress/tests/dev-test-root
+++ b/regress/tests/dev-test-root
@@ -11,14 +11,14 @@ require_root
 
 scripts/cleanup
 scripts/copy-test-confs
-echo "/dev" >/tmp/file-list
+echo "/dev" >${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 volume=TestVolume001
 run job=NightlySave yes
 wait
@@ -26,12 +26,11 @@ messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA
 
@@ -65,7 +64,7 @@ sed -f sed.scr 1 | sort >restored
 rm -f sed.scr
 #
 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 " "