Update

[bacula/bacula] / regress / tests / four-concurrent-jobs-test

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 05a04e435a2fc71b514c5af49dcb9786fe215e74..5190dfce6df18112f8931c34e17f0652ef17a877 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -8,19 +8,18 @@
 TestName="four-concurrent-jobs-test"
 JobName=Four-concurrent-jobs
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-test-confs
-echo "${cwd}/build" >/tmp/file-list
+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 storage=File1
 TestVolume001
 label storage=File1
@@ -28,28 +27,38 @@ TestVolume002
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
 @#12
-setdebug level=001 Storage=File1
-list volumes
+setdebug level=51 Storage=File1
+status storage=File1
+llist volume=TestVolume001
+llist volume=TestVolume002
 run job=$JobName level=Full Storage=File1
 yes
 reload
-list volumes
+llist volume=TestVolume001
+llist volume=TestVolume002
 run job=$JobName level=Full Storage=File1
 yes
 reload
-list volumes
+llist volume=TestVolume001
+llist volume=TestVolume002
 run job=$JobName level=Full Storage=File1
 yes
 reload
-list volumes
+llist volume=TestVolume001
+llist volume=TestVolume002
+status storage=File1
 run job=$JobName level=Full Storage=File1
 yes
+status storage=File1
 reload
 reload
 reload
 reload
 @sleep 2
 status dir
+status storage=File1
+llist volume=TestVolume001
+llist volume=TestVolume002
 reload
 @sleep 5
 messages
@@ -62,7 +71,7 @@ messages
 @# 
 @# now do a restore
 @#
-@$out   tmp/log2.out
+@$out   ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File1
 unmark *
 mark *