X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fconcurrent-jobs-test;h=37c69bd80197b8d354b4a8480edf20ded473930b;hb=9585308707921844c2ec545701dc6be3d4e2ae0b;hp=5231c09674db6f62fd2a0b3db2145cd2a2792777;hpb=d7d501dae0729c2228b9e0a263086789e6b6de23;p=bacula%2Fbacula

diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test
index 5231c09674..37c69bd801 100755
--- a/regress/tests/concurrent-jobs-test
+++ b/regress/tests/concurrent-jobs-test
@@ -6,11 +6,10 @@
 TestName="concurrent-jobs-test"
 JobName=concurrent-jobs
 . scripts/functions
-set_debug 0
 
-scripts/copy-test-confs
-scripts/cleanup
-echo "${cwd}/tmp/largefile" >/tmp/file-list
+copy_test_confs
+
+echo "${cwd}/tmp/largefile" >${cwd}/tmp/file-list
 if test -c /dev/urandom ; then
 # Create 56MB file with random data
    echo "Creating a 56MB file with random data ..."
@@ -28,23 +27,24 @@ fi
 
 echo "largefile created"
 
+change_jobname CompressedTest $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=File volume=TestVolume001
-run job=CompressedTest level=Full yes
-run job=CompressedTest level=Full yes
-run job=CompressedTest level=Full yes
-run job=CompressedTest level=Full yes
+run job=$JobName level=Full yes
+run job=$JobName level=Full yes
+run job=$JobName level=Full yes
+run job=$JobName level=Full yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-@$out   tmp/log2.out
+@$out   ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -61,5 +61,6 @@ check_for_zombie_jobs storage=File
 stop_bacula
 
 check_two_logs
-check_restore_diff
+diff ${cwd}/tmp/largefile  ${cwd}/tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null
+dstat=$?
 end_test