Add more debug

[bacula/bacula] / regress / tests / incremental-2disk

diff --git a/regress/tests/incremental-2disk b/regress/tests/incremental-2disk
index 1064e7e19867982404de92bfcf50db860d1af594..63098bcd9b694d0c34dde01e4cb848acb504138a 100755 (executable)
--- a/regress/tests/incremental-2disk
+++ b/regress/tests/incremental-2disk
@@ -20,7 +20,7 @@ cd ..
 scripts/copy-2disk-confs
 scripts/prepare-two-disks
 
-echo "${cwd}/tmp/build" >/tmp/file-list
+echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 if test ! -d ${cwd}/tmp/build ; then
    mkdir ${cwd}/tmp/build
 fi
@@ -34,10 +34,10 @@ change_jobname $JobName
 start_test
 
 # Write out bconsole commands
-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=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=0
 run job=$JobName yes
@@ -52,10 +52,10 @@ echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
 
 
-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
 @# Force Incremental on the second Volume
 update volume=TestVolume001 VolStatus=Used
 run level=Incremental job=$JobName yes
@@ -64,7 +64,7 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores 
 7
 <${cwd}/tmp/restore-list
@@ -83,7 +83,7 @@ stop_bacula
 #
 # Delete .c files because we will only restored the txt files
 #
-rm -f tmp/build/*.c
+rm -f ${cwd}/tmp/build/*.c
 
 check_two_logs
 check_restore_tmp_build_diff
@@ -94,11 +94,11 @@ check_restore_tmp_build_diff
 #  an error.
 #
 if [ $dstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
-   cat tmp/log1.out
+   cat ${cwd}/tmp/log1.out
    echo "  "
-   cat tmp/log2.out
+   cat ${cwd}/tmp/log2.out
    echo "  "
-   diff -r tmp/build tmp/bacula-restores${cwd}/tmp/build
+   diff -r ${cwd}/tmp/build ${cwd}/tmp/bacula-restores${cwd}/tmp/build
 fi
 
 end_test