X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fmigration-occupancy-test;h=21a0d48ecc0def2ab10ffb328dba13d60c141ca0;hb=8f8263fb6dbc1c4f4c53d2d7c02a6fa7abfce4ef;hp=aed2298afac9837815fd3aea12d760ff98bbe219;hpb=8fccc8a5e1cac7acfbdd4f4b3ab29131824928ad;p=bacula%2Fbacula

diff --git a/regress/tests/migration-occupancy-test b/regress/tests/migration-occupancy-test
index aed2298afa..21a0d48ecc 100755
--- a/regress/tests/migration-occupancy-test
+++ b/regress/tests/migration-occupancy-test
@@ -8,14 +8,12 @@
 TestName="migration-occupancy-test"
 JobName=MigrationJobSave
 . scripts/functions
-set_debug 0
 
-. config.out
 
 scripts/cleanup
 scripts/copy-migration-confs
-scripts/prepare-two-disks
-echo "${cwd}/build" >/tmp/file-list
+scripts/prepare-disk-changer
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $JobName
 start_test
@@ -27,10 +25,10 @@ start_test
 #              Pool Full    uses Storage=DiskChanger
 
 # Write out bconsole commands
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=File volume=FileVolume001 Pool=Default
 label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0
 label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0
@@ -51,7 +49,7 @@ wait
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger
 unmark *
 mark *