X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fsix-vol-test;h=bebf0dd61b286c8688f8fa615d114a5885b2c161;hb=965d73a13f44e679a8dd5a9135874fb250fae911;hp=dad407b115d8b9ff612290d9f82377e663bf7edb;hpb=45dc0d2f1f568fcc62526533adacde65df441837;p=bacula%2Fbacula

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index dad407b115..bebf0dd61b 100755
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -14,19 +14,27 @@ fi
 
 scripts/cleanup
 scripts/copy-testa-confs
-echo "${cwd}/tmp/largefile" >/tmp/file-list
+# copy special conf file
+/bin/cp -f scripts/testb-bacula-dir.conf bin/bacula-dir.conf
+
+echo "${cwd}/tmp/largefile" >${cwd}/tmp/file-list
 # Create 56MB file with random data
 echo "Creating a 56MB file with random data ..."
-dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000
+dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000 >/dev/null 2>&1
 echo "largefile created"
 
 change_jobname MultiVol $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
+setdebug level=150 storage=File
+run job=$JobName storage=File yes
+run job=$JobName storage=File yes
+run job=$JobName storage=File yes
+run job=$JobName storage=File yes
 run job=$JobName storage=File yes
 wait
 list volumes
@@ -34,7 +42,12 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
+sql
+select * from JobMedia where JobId=4;
+select * from JobMedia where JobId=5;
+
+setdebug level=150 storage=File
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -51,6 +64,6 @@ check_for_zombie_jobs storage=File
 stop_bacula
 
 check_two_logs
-diff tmp/largefile  tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null
+diff ${cwd}/tmp/largefile  ${cwd}/tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null
 dstat=$?
 end_test