X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fsix-vol-test;h=3bc11d26077c7e877e496bf0b610b08764836418;hb=58754f931be37814b0b42f1e5c140d629df0a8eb;hp=6969c3c7ccd506c2530efcabeafa930e308200db;hpb=6a8eafaf4e7f1224125927475704534694ad4cd0;p=bacula%2Fbacula

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index 6969c3c7cc..3bc11d2607 100755
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -6,7 +6,6 @@
 TestName="six-vol-test"
 JobName=SixVol
 . scripts/functions
-set_debug 0
 
 if test ! -c /dev/urandom ; then
    echo "No random device. Test skipped.\n"
@@ -15,26 +14,40 @@ 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
-@output /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /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
 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 *
@@ -42,7 +55,6 @@ done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA
 
@@ -51,6 +63,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