ebl tweak output

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

diff --git a/regress/tests/incremental-2media b/regress/tests/incremental-2media
index c476b16819f03d4ba56dbe18099b1444bdf66dd7..ba7a5373eb30bac4c1d6f39089742b85885ade7b 100755 (executable)
--- a/regress/tests/incremental-2media
+++ b/regress/tests/incremental-2media
@@ -10,21 +10,20 @@ TestName="incremental-2media"
 JobName=Inc2media
 . scripts/functions
 
-. config.out
 
 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
@@ -40,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
@@ -53,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