Add new restart regression tests from master

[bacula/bacula] / regress / tests / backup-to-null

diff --git a/regress/tests/backup-to-null b/regress/tests/backup-to-null
index 6acc65bc59bc52580d2f0afed1b0a1119a5afc6c..7540d2fbbe45e8d57c300a3506f955c33a6550ed 100755 (executable)
--- a/regress/tests/backup-to-null
+++ b/regress/tests/backup-to-null
@@ -13,18 +13,18 @@ JobName=backuptonull
 scripts/cleanup
 scripts/copy-fifo-confs
 
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $JobName
-rm -f tmp/log1.out tmp/log2.out
+rm -f ${cwd}/tmp/log1.out ${cwd}/tmp/log2.out
 start_test
 
 
 # Write out bconsole commands
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 @#setdebug level=200 storage=Dummy
 label storage=Dummy volume=TestVolume001 slot=0 pool=Default
 run job=$JobName yes
@@ -46,10 +46,10 @@ stop_bacula
 touch ${cwd}/build/src/dird/*.c
 echo "test test" > ${cwd}/build/src/dird/xxx
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 list volumes
 run job=$JobName yes
 wait
@@ -63,9 +63,9 @@ run_bacula
 check_for_zombie_jobs storage=Dummy
 stop_bacula
 
-grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+grep "^  Termination: *Backup OK" ${cwd}/tmp/log1.out 2>&1 >/dev/null
 bstat=$?
-grep "^  Termination: *Backup OK" tmp/log2.out 2>&1 >/dev/null
+grep "^  Termination: *Backup OK" ${cwd}/tmp/log2.out 2>&1 >/dev/null
 dstat=$?
 
 # not yet implemented