X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fincremental-2media;h=ba7a5373eb30bac4c1d6f39089742b85885ade7b;hb=9d3109a03bb69d2ef5bf39f2cbe424cf9fc2076d;hp=c8624c1e173c6f7531756bb700d6131763f0d09b;hpb=bd61c81550b1ed8dcaea21865a03bc5093483c06;p=bacula%2Fbacula

diff --git a/regress/tests/incremental-2media b/regress/tests/incremental-2media
index c8624c1e17..ba7a5373eb 100755
--- a/regress/tests/incremental-2media
+++ b/regress/tests/incremental-2media
@@ -13,17 +13,17 @@ JobName=Inc2media
 
 scripts/cleanup
 scripts/copy-2disk-confs
-scripts/prepare-two-disks
-echo "${cwd}/build" >/tmp/file-list
+scripts/prepare-disk-changer
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 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=File volume=TestVolume002 Pool=Default
 run job=$JobName yes
@@ -39,10 +39,10 @@ echo "Backup 1 done"
 touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 
-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
 setdebug level=51 storage=File
@@ -52,11 +52,15 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
-setdebug level=51 storage=DDS-4
+@$out ${cwd}/tmp/log2.out
+setdebug level=151 storage=DDS-4
 restore where=${cwd}/tmp/bacula-restores select all done 
 yes
 wait
+restore where=${cwd}/tmp/bacula-restores select all done 
+yes
+wait
+status storage=DDS-4
 messages
 @$out
 quit