X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=regress%2Ftests%2Fmigration-volume-test;h=13f7e67196fcd9409a06f844de3c7f5bb0f03797;hb=ccb41474b231924fa189d67b4aac90f5f2a2899d;hp=bdcc87fcab6f56b9baba5108c4608d5604f6015d;hpb=4927688d9368cd1880f5811bd9bbf8ac5e93e4cd;p=bacula%2Fbacula

diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test
index bdcc87fcab..13f7e67196 100755
--- a/regress/tests/migration-volume-test
+++ b/regress/tests/migration-volume-test
@@ -8,14 +8,12 @@
 TestName="migration-volume-test"
 JobName=MigVolBackup
 . 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
 #cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 #sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 
@@ -29,10 +27,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=File volume=FileVolume002 Pool=Default
 update Volume=FileVolume001 MaxVolBytes=3000000 pool=Default
@@ -83,7 +81,7 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger
 unmark *
 mark *
@@ -99,8 +97,6 @@ run_bacula
 check_for_zombie_jobs storage=File
 stop_bacula
 
-exit
-
 check_two_logs
 check_restore_diff
 end_test