BEE Backport regress/tests/four-concurrent-jobs-test

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

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Fri Aug 17 11:53:52 2018 +0200

    regress: Send the debug to the trace file in four-concurrent-jobs-test

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index e157ca3af8df5772b3debafc661d846a993fd8f0..7f64f10eec4e08600fc31c680101afa22c840438 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -2,8 +2,6 @@
 #
 # Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
-#
-
 #
 # Run four jobs at the same time, with two Volumes.
 #   Set max Vol bytes of first volume
@@ -32,7 +30,7 @@ TestVolume002
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
 @#12
-setdebug level=51 Storage=File1
+setdebug level=51 Storage=File1 trace=1
 status storage=File1
 status client
 llist volume=TestVolume001
@@ -98,7 +96,7 @@ select JobId,MediaId,StartFile,StartBlock,EndFile,EndBlock from JobMedia;
 @$out   ${cwd}/tmp/log2.out
 status client
 status storage=File1
-setdebug level=100 Storage=File1
+setdebug level=100 Storage=File1 trace=1
 restore where=${cwd}/tmp/bacula-restores select storage=File1
 unmark *
 mark *