X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2F2drive-incremental-2disk;h=97aab7adf1430f4dcad7131f56d06fa8fec9ec6f;hb=86e786f4fb2faf7c9487a0bf4633371cbb57b759;hp=4a4b84a8bee634e2795920ce604d21a6612204ed;hpb=ab3abf5627f23481b030471b49fe88092ec482bd;p=bacula%2Fbacula

diff --git a/regress/tests/2drive-incremental-2disk b/regress/tests/2drive-incremental-2disk
index 4a4b84a8be..97aab7adf1 100755
--- a/regress/tests/2drive-incremental-2disk
+++ b/regress/tests/2drive-incremental-2disk
@@ -16,7 +16,7 @@ scripts/prepare-two-disks
 change_jobname localhost-fd $JobName
 start_test
 
-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
@@ -27,7 +27,7 @@ echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list
 cd ${cwd}
 
 # Turn off Prefer Mounted Volumes so we use 2 drives
-outf="tmp/sed_tmp"
+outf="${cwd}/tmp/sed_tmp"
 echo "s%# Prefer Mounted Volumes%  Prefer Mounted Volumes%g" >${outf}
 cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
 # Comment the next line out to write everything to one drive
@@ -35,10 +35,13 @@ cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
 sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
 
 # Write out bconsole commands
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
+setdebug level=3 dir
+setdebug level=3 storage=DDS-4
+setdebug level=3 client
 label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1
 status storage=DDS-4
@@ -48,8 +51,11 @@ run job=NightlySave yes
 run job=NightlySave yes
 run job=NightlySave yes
 run job=NightlySave yes
-@sleep 3
+@sleep 5
 status storage=DDS-4
+list volumes
+list jobs
+messages
 wait
 list volumes
 list jobs
@@ -62,13 +68,14 @@ run_bacula
 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
 status storage=DDS-4
+list volumes
 @#setdebug level=120 storage=DDS-4
 run level=Incremental job=NightlySave yes
 wait
@@ -78,7 +85,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
@@ -96,7 +103,7 @@ stop_bacula
 
 check_two_logs
 # The restore should read from TestVolume002, which was on drive 1
-grep TestVolume002 tmp/log2.out >/dev/null 2>&1
+grep TestVolume002 ${cwd}/tmp/log2.out >/dev/null 2>&1
 # Note rstat may already be set, so we don't just store into it
 if [ $? != 0 ] ; then
    rstat=$?
@@ -105,7 +112,7 @@ fi
 #
 # Delete .c files because we will only restored the txt files
 #
-rm -f tmp/build/*.c
+rm -f ${cwd}/tmp/build/*.c
 check_restore_tmp_build_diff
 
 end_test