X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ffast-two-pool-test;h=0f8d538040eb2ada35c0b2ca05db1b67b429cb96;hb=12b8fd96780583d7393c5e851f81a00ba653e347;hp=1457d8e34ace921ec347a402b39b528406214df2;hpb=ed4d03af9964f16ce9b81c94f59eb1c0139f0e18;p=bacula%2Fbacula

diff --git a/regress/tests/fast-two-pool-test b/regress/tests/fast-two-pool-test
index 1457d8e34a..0f8d538040 100755
--- a/regress/tests/fast-two-pool-test
+++ b/regress/tests/fast-two-pool-test
@@ -4,7 +4,7 @@
 #  an autochanger. Note, the Director has three Pools in its 
 #  conf:  Default, Full, and Inc.  Default is used in the
 #  NightlySave job by default.  What is backed up is what
-#  is in /tmp/file-list, which is by default the Bacula
+#  is in ${cwd}/tmp/file-list, which is by default the Bacula
 #  source code (i.e. the build directory).
 #
 #  Note, we use the virtual disk autochanger.
@@ -12,28 +12,25 @@
 TestName="fast-two-pool-test"
 JobName=Fast-two-pool
 . scripts/functions
-set_debug 0
 
-. config.out
-cwd=`pwd`
 scripts/cleanup
 scripts/copy-2disk-confs
 scripts/prepare-two-disks
  
 # Make a relatively large backup set 5 x source code directory
 #  Reduced to 1 for portable
-echo "${cwd}/build" >/tmp/file-list
-echo "${cwd}/build" >/tmp/file-list
-echo "${cwd}/build" >/tmp/file-list
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 start_test
 
 # Write out bconsole commands to a file
-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=150 storage=DDS-4
 label storage=DDS-4 volume=TestVolume001 slot=1 pool=Full drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0
@@ -49,12 +46,16 @@ run job=NightlySave1 level=Full pool=Full yes
 status storage=DDS-4
 messages
 wait
-list volumes
 messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
+list volumes
+list jobs
+status storage=DDS-4
+messages
+setdebug level=100 storage=DDS-4
 restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 yes
 wait