BEE Backport regress/tests/six-vol-test

This commit is the result of the squash of the following main commits:

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Mon Mar 12 11:09:51 2018 +0100

    regress: Reduce six-vol-test debug output

Author: Kern Sibbald <kern@sibbald.com>
Date:   Sat Nov 12 11:07:14 2016 +0100

    regress: reduce output when non-debug

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index f9975abc9ee7067eeae9f49404a2abbfe93a8bb6..bd17c0f74da7d333bfb2362cc2d71988391beeee 100755 (executable)
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -2,8 +2,6 @@
 #
 # Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
-#
-
 #
 # Create a 60MB file with random bytes. Back it up to 6 Volumes
 #   each constrained to 10MB using the automatic labeling feature.
@@ -24,9 +22,9 @@ scripts/copy-testa-confs
 
 echo "${cwd}/tmp/largefile" >${cwd}/tmp/file-list
 # Create 56MB file with random data
-echo "Creating a 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 >/dev/null 2>&1
-echo "largefile created"
+#echo "largefile created"
 
 change_jobname MultiVol $JobName
 start_test
@@ -35,7 +33,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-setdebug level=50 storage=File
+setdebug level=200 storage=File trace=1
 run job=$JobName storage=File yes
 run job=$JobName storage=File yes
 run job=$JobName storage=File yes
@@ -52,7 +50,7 @@ sql
 select * from JobMedia where JobId=4;
 select * from JobMedia where JobId=5;
 
-setdebug level=50 storage=File
+setdebug level=200 storage=File trace=1
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *