Update

[bacula/bacula] / regress / tests / 2drive-concurrent-test

diff --git a/regress/tests/2drive-concurrent-test b/regress/tests/2drive-concurrent-test
index a24854d31fd48434d695d6dbd238ec584279f9f5..dfd752e6d24df765b98a4305edc6d64ad01ae4a3 100755 (executable)
--- a/regress/tests/2drive-concurrent-test
+++ b/regress/tests/2drive-concurrent-test
@@ -12,73 +12,75 @@ JobName=Four-concurrent-jobs
 scripts/cleanup
 scripts/copy-2disk-drive-confs
 scripts/prepare-two-disks
-echo "${cwd}/build" >/tmp/file-list
+CLIENT=2drive2disk
+
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $JobName
 start_test
 
-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
 label pool=Default storage=DDS-4 volume=TestVolume001 slot=1 drive=0
 label pool=Default storage=DDS-4 volume=TestVolume002 slot=2 drive=1
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
 @#12
-setdebug level=001 Storage=DDS-4
+setdebug level=200 Storage=DDS-4
 status storage=DDS-4
-llist volume=TestVolume001
-llist volume=TestVolume002
+list jobs
+list volumes
 run job=$JobName level=Full Storage=DDS-4
 yes
-reload
-llist volume=TestVolume001
-llist volume=TestVolume002
+@#reload
+list jobs
+list volumes
 run job=$JobName level=Full Storage=DDS-4
 yes
-reload
-llist volume=TestVolume001
-llist volume=TestVolume002
+@#reload
+list jobs
+list volumes
 run job=$JobName level=Full Storage=DDS-4
 yes
-reload
-llist volume=TestVolume001
-llist volume=TestVolume002
+@#reload
+list jobs
+list volumes
 status storage=DDS-4
 run job=$JobName level=Full Storage=DDS-4
 yes
 status storage=DDS-4
-reload
-reload
-reload
-reload
+@#reload
+@#reload
+@#reload
+@#reload
 @sleep 2
 status dir
 status storage=DDS-4
-llist volume=TestVolume001
-llist volume=TestVolume002
-reload
+@#reload
 @sleep 5
+list jobs
+list volumes
 messages
-reload
-reload
+@#reload
+@#reload
 wait
 status storage=DDS-4
-reload
+@#reload
 messages
 @# 
 @# now do a restore
 @#
-@$out   tmp/log2.out
+@$out   ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=DDS-4
 unmark *
 mark *
 done
 yes
 wait
-reload
-reload
+@#reload
+@#reload
 messages
 @output
 quit