From 00a8f284933e0d912ae9588924a6f9a68062bb46 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 30 May 2007 12:32:16 +0000
Subject: [PATCH] Update new debugging method

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4938 91ce42f0-d328-0410-95d8-f526ca767f89
---
 regress/scripts/functions                   | 4 +++-
 regress/tests/2drive-incremental-2disk      | 3 ---
 regress/tests/2drive-incremental-2tape      | 3 ---
 regress/tests/auto-label-test               | 2 +-
 regress/tests/backup-bacula-tape            | 1 -
 regress/tests/backup-bacula-test            | 1 -
 regress/tests/backup-to-null                | 2 --
 regress/tests/backup-win32-tape             | 1 -
 regress/tests/bextract-test                 | 1 -
 regress/tests/bscan-fast-tape               | 1 -
 regress/tests/bscan-tape                    | 1 -
 regress/tests/bscan-test                    | 2 --
 regress/tests/bsr-opt-test                  | 1 -
 regress/tests/btape-fill-full-tape          | 1 -
 regress/tests/btape-fill-tape               | 1 -
 regress/tests/bug-fatal-test                | 2 +-
 regress/tests/compress-encrypt-test         | 1 -
 regress/tests/compressed-test               | 1 -
 regress/tests/concurrent-jobs-test          | 1 -
 regress/tests/data-encrypt-test             | 1 -
 regress/tests/differential-test             | 1 -
 regress/tests/eighty-simultaneous-jobs-tape | 1 -
 regress/tests/encrypt-bug-test              | 1 -
 regress/tests/eot-fail-tape                 | 1 -
 regress/tests/fast-two-pool-test            | 2 --
 regress/tests/fifo-test                     | 2 --
 regress/tests/fixed-block-size-tape         | 1 -
 regress/tests/four-concurrent-jobs-tape     | 1 -
 regress/tests/four-concurrent-jobs-test     | 2 +-
 regress/tests/four-jobs-tape                | 1 -
 regress/tests/four-jobs-test                | 2 --
 regress/tests/gigaslam-sparse-test          | 2 --
 regress/tests/hardlink-test                 | 1 -
 regress/tests/incremental-2disk             | 1 -
 regress/tests/incremental-tape              | 1 -
 regress/tests/incremental-test              | 1 -
 regress/tests/maxtime-test                  | 4 ++--
 regress/tests/memory-bug-tape               | 1 -
 regress/tests/migration-job-test            | 1 -
 regress/tests/migration-jobspan-test        | 1 -
 regress/tests/migration-occupancy-test      | 1 -
 regress/tests/migration-time-test           | 1 -
 regress/tests/migration-volume-test         | 1 -
 regress/tests/query-test                    | 1 -
 regress/tests/recycle-test                  | 2 --
 regress/tests/regexwhere-test               | 2 +-
 regress/tests/relabel-tape                  | 1 -
 regress/tests/restore-by-file-tape          | 1 -
 regress/tests/restore-by-file-test          | 2 --
 regress/tests/restore-disk-seek-test        | 1 -
 regress/tests/restore-seek-tape             | 1 -
 regress/tests/restore2-by-file-test         | 1 -
 regress/tests/runscript-test                | 1 -
 regress/tests/scratch-pool-test             | 1 -
 regress/tests/six-vol-test                  | 1 -
 regress/tests/small-file-size-tape          | 1 -
 regress/tests/span-vol-test                 | 2 --
 regress/tests/sparse-compressed-test        | 1 -
 regress/tests/sparse-encrypt-test           | 1 -
 regress/tests/sparse-test                   | 2 --
 regress/tests/three-pool-test               | 3 ---
 regress/tests/truncate-bug-tape             | 1 -
 regress/tests/two-jobs-test                 | 1 -
 regress/tests/two-pool-tape                 | 1 -
 regress/tests/two-pool-test                 | 1 -
 regress/tests/two-vol-test                  | 1 -
 regress/tests/two-volume-tape               | 1 -
 regress/tests/two-volume-test               | 1 -
 regress/tests/verify-cat-test               | 1 -
 regress/tests/verify-vol-tape               | 1 -
 regress/tests/verify-vol-test               | 1 -
 regress/tests/weird-files-test              | 1 -
 regress/tests/weird-files2-test             | 1 -
 regress/tests/win32-backup-tape             | 1 -
 regress/tests/win32-to-linux-tape           | 1 -
 75 files changed, 9 insertions(+), 92 deletions(-)

diff --git a/regress/scripts/functions b/regress/scripts/functions
index f00029c7e3..e63cf3d7c2 100644
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -25,7 +25,9 @@ run_bacula()
 {
    debug_wait
    if test "$debug" -eq 1 ; then
-     bin/bacula start
+     bin/bacula-ctl-sd start
+     bin/bacula-ctl-fd start
+     bin/bacula-ctl-dir start
      cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
    else
      bin/bacula start 2>&1 >/dev/null
diff --git a/regress/tests/2drive-incremental-2disk b/regress/tests/2drive-incremental-2disk
index 248308da3a..8e404e4722 100755
--- a/regress/tests/2drive-incremental-2disk
+++ b/regress/tests/2drive-incremental-2disk
@@ -9,9 +9,6 @@
 TestName="2drive-incremental-2disk"
 JobName="2drive2disk"
 . scripts/functions
-set_debug 0
-
-cwd=`pwd`
 
 scripts/cleanup
 scripts/copy-2disk-drive-confs
diff --git a/regress/tests/2drive-incremental-2tape b/regress/tests/2drive-incremental-2tape
index a301c1ca55..fb54660959 100755
--- a/regress/tests/2drive-incremental-2tape
+++ b/regress/tests/2drive-incremental-2tape
@@ -13,9 +13,6 @@ fi
 TestName="2drive-incremental-2tape"
 JobName="2drive2tape"
 . scripts/functions
-set_debug 0
-
-cwd=`pwd`
 
 scripts/copy-2drive-confs
 scripts/cleanup-2drive
diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test
index 6583937e03..247f30303c 100755
--- a/regress/tests/auto-label-test
+++ b/regress/tests/auto-label-test
@@ -6,7 +6,7 @@
 TestName="auto-label-test"
 JobName=AutoLabel
 . scripts/functions
-set_debug 0
+
 copy_test_confs
 
 echo "${cwd}/build" >/tmp/file-list
diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index 21d521d563..5d578a2dcb 100755
--- a/regress/tests/backup-bacula-tape
+++ b/regress/tests/backup-bacula-tape
@@ -9,7 +9,6 @@
 TestName="backup-bacula-tape"
 JobName=backuptape
 . scripts/functions
-set_debug 0
 
 scripts/copy-tape-confs
 scripts/cleanup-tape
diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 2dda0ac205..d61a8688ac 100755
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -6,7 +6,6 @@
 TestName="backup-bacula-test"
 JobName=backup
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-confs
diff --git a/regress/tests/backup-to-null b/regress/tests/backup-to-null
index 3f3df219cc..6acc65bc59 100755
--- a/regress/tests/backup-to-null
+++ b/regress/tests/backup-to-null
@@ -9,9 +9,7 @@
 TestName="backup-to-null"
 JobName=backuptonull
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
 scripts/cleanup
 scripts/copy-fifo-confs
 
diff --git a/regress/tests/backup-win32-tape b/regress/tests/backup-win32-tape
index f6f6c3b0c0..e8ed6b7e85 100755
--- a/regress/tests/backup-win32-tape
+++ b/regress/tests/backup-win32-tape
@@ -7,7 +7,6 @@
 TestName="backup-win32-tape"
 JobName=backupwintape
 . scripts/functions
-set_debug 0
 
 scripts/cleanup-tape
 scripts/copy-win32-confs
diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index 904a39223b..0407187980 100755
--- a/regress/tests/bextract-test
+++ b/regress/tests/bextract-test
@@ -7,7 +7,6 @@
 TestName="bextract-test"
 JobName="bextract"
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-test-confs
diff --git a/regress/tests/bscan-fast-tape b/regress/tests/bscan-fast-tape
index 2a54d4bf1d..0040ede662 100755
--- a/regress/tests/bscan-fast-tape
+++ b/regress/tests/bscan-fast-tape
@@ -8,7 +8,6 @@
 TestName="bscan-tape"
 JobName=bscantape
 . scripts/functions
-set_debug 0
 
 copy_tape_confs
 
diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape
index 56ef6e273b..41ae4b9ac1 100755
--- a/regress/tests/bscan-tape
+++ b/regress/tests/bscan-tape
@@ -8,7 +8,6 @@
 TestName="bscan-tape"
 JobName=bscantape
 . scripts/functions
-set_debug 0
 
 copy_tape_confs
 
diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index 92e81651d6..59c4905400 100755
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -9,9 +9,7 @@
 TestName="bscan-test"
 JobName=bscan
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
 scripts/cleanup
 scripts/copy-test-confs
 echo "${cwd}/build" >/tmp/file-list
diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index c2dfd74241..677d45d8da 100755
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -9,7 +9,6 @@
 TestName="bsr-opt-test"
 JobName=bsr-opt
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-test-confs
diff --git a/regress/tests/btape-fill-full-tape b/regress/tests/btape-fill-full-tape
index f4ba59fb5b..b2fc446ad1 100755
--- a/regress/tests/btape-fill-full-tape
+++ b/regress/tests/btape-fill-full-tape
@@ -5,7 +5,6 @@
 TestName="btape-fill-full-tape"
 JobName=AutoLabel
 . scripts/functions
-set_debug 0
 
 scripts/copy-tape-confs
 scripts/cleanup-tape
diff --git a/regress/tests/btape-fill-tape b/regress/tests/btape-fill-tape
index b3fb4e5afd..65661d5ffa 100755
--- a/regress/tests/btape-fill-tape
+++ b/regress/tests/btape-fill-tape
@@ -5,7 +5,6 @@
 TestName="btape-fill-tape"
 JobName=filltape
 . scripts/functions
-set_debug 0
 
 copy_tape_confs
 
diff --git a/regress/tests/bug-fatal-test b/regress/tests/bug-fatal-test
index 804d15c833..8e19473542 100755
--- a/regress/tests/bug-fatal-test
+++ b/regress/tests/bug-fatal-test
@@ -7,7 +7,7 @@ TestName="bug-fatal-test"
 JobName=backup
 
 . scripts/functions
-set_debug 0
+
 copy_test_confs
 
 rm -f bin/bacula-dir.conf
diff --git a/regress/tests/compress-encrypt-test b/regress/tests/compress-encrypt-test
index 265512bc22..9b77d12abd 100755
--- a/regress/tests/compress-encrypt-test
+++ b/regress/tests/compress-encrypt-test
@@ -6,7 +6,6 @@
 TestName="compressed-encrypt-test"
 JobName=CompressedTest
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-crypto-confs
diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index 9be43dead2..2cbe9087c3 100755
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -6,7 +6,6 @@
 TestName="compressed-test"
 JobName=compressed
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-test-confs
diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test
index 1cb0580ce9..80c30b24f2 100755
--- a/regress/tests/concurrent-jobs-test
+++ b/regress/tests/concurrent-jobs-test
@@ -6,7 +6,6 @@
 TestName="concurrent-jobs-test"
 JobName=concurrent-jobs
 . scripts/functions
-set_debug 0
 
 copy_test_confs
 
diff --git a/regress/tests/data-encrypt-test b/regress/tests/data-encrypt-test
index d184c9737b..5893054ed6 100755
--- a/regress/tests/data-encrypt-test
+++ b/regress/tests/data-encrypt-test
@@ -7,7 +7,6 @@
 TestName="data-encrypt-test"
 JobName=Crypto
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-crypto-confs
diff --git a/regress/tests/differential-test b/regress/tests/differential-test
index 4949bfe6d8..36205f422c 100755
--- a/regress/tests/differential-test
+++ b/regress/tests/differential-test
@@ -6,7 +6,6 @@
 TestName="differential-test"
 JobName=differential
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-test-confs
diff --git a/regress/tests/eighty-simultaneous-jobs-tape b/regress/tests/eighty-simultaneous-jobs-tape
index 883a0187d1..8125ab7308 100755
--- a/regress/tests/eighty-simultaneous-jobs-tape
+++ b/regress/tests/eighty-simultaneous-jobs-tape
@@ -5,7 +5,6 @@
 TestName="eighty-simultaneous-jobs-tape"
 JobName=EightySimultaneousJobs
 . scripts/functions
-set_debug 0
 
 scripts/cleanup-tape
 scripts/copy-tape-confs
diff --git a/regress/tests/encrypt-bug-test b/regress/tests/encrypt-bug-test
index 77077d7307..235f14a6f2 100755
--- a/regress/tests/encrypt-bug-test
+++ b/regress/tests/encrypt-bug-test
@@ -6,7 +6,6 @@
 TestName="encrypt-bug-test"
 JobName=Crypto-bug
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-crypto-confs
diff --git a/regress/tests/eot-fail-tape b/regress/tests/eot-fail-tape
index 4907e8dca6..dd9ee7c0a0 100755
--- a/regress/tests/eot-fail-tape
+++ b/regress/tests/eot-fail-tape
@@ -6,7 +6,6 @@
 TestName="eot-fail-tape"
 JobName=eotfailtape
 . scripts/functions
-set_debug 0
 
 scripts/cleanup-tape
 scripts/copy-tape-confs
diff --git a/regress/tests/fast-two-pool-test b/regress/tests/fast-two-pool-test
index 1457d8e34a..b259efbbfb 100755
--- a/regress/tests/fast-two-pool-test
+++ b/regress/tests/fast-two-pool-test
@@ -12,10 +12,8 @@
 TestName="fast-two-pool-test"
 JobName=Fast-two-pool
 . scripts/functions
-set_debug 0
 
 . config.out
-cwd=`pwd`
 scripts/cleanup
 scripts/copy-2disk-confs
 scripts/prepare-two-disks
diff --git a/regress/tests/fifo-test b/regress/tests/fifo-test
index 05980a8cd2..dabe5c1a80 100755
--- a/regress/tests/fifo-test
+++ b/regress/tests/fifo-test
@@ -5,9 +5,7 @@
 TestName="fifo-test"
 JobName=FIFOTest
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
 scripts/cleanup
 scripts/copy-test-confs
 echo "/tmp/bfifo" >/tmp/file-list
diff --git a/regress/tests/fixed-block-size-tape b/regress/tests/fixed-block-size-tape
index 10de2c45e5..c1e5212eb2 100755
--- a/regress/tests/fixed-block-size-tape
+++ b/regress/tests/fixed-block-size-tape
@@ -7,7 +7,6 @@
 TestName="fixed-block-size-tape"
 JobName=fixedblocksize
 . scripts/functions
-set_debug 0
 
 copy_tape_confs
 
diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape
index 0d0918f62b..31f2dead5b 100755
--- a/regress/tests/four-concurrent-jobs-tape
+++ b/regress/tests/four-concurrent-jobs-tape
@@ -5,7 +5,6 @@
 TestName="four-concurrent-jobs-tape"
 JobName=FourConcurrentJobs
 . scripts/functions
-set_debug 0
 
 scripts/cleanup-tape
 scripts/copy-tape-confs
diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index b55a441f26..fb7cf9702d 100755
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -27,7 +27,7 @@ TestVolume002
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
 @#12
-setdebug level=001 Storage=File1
+setdebug level=51 Storage=File1
 status storage=File1
 llist volume=TestVolume001
 llist volume=TestVolume002
diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape
index 4252ba2d7e..e95b1b7617 100755
--- a/regress/tests/four-jobs-tape
+++ b/regress/tests/four-jobs-tape
@@ -7,7 +7,6 @@
 TestName="four-jobs-tape"
 JobName=fourjobstape
 . scripts/functions
-set_debug 0
 
 scripts/cleanup-tape
 scripts/copy-tape-confs
diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index 20fdc05fca..db27f2c9b6 100755
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -7,9 +7,7 @@
 TestName="four-jobs-test"
 JobName=SpanVol
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
 scripts/cleanup
 scripts/copy-test-confs
 echo "${cwd}/build" >/tmp/file-list
diff --git a/regress/tests/gigaslam-sparse-test b/regress/tests/gigaslam-sparse-test
index f638735205..4e00043d24 100755
--- a/regress/tests/gigaslam-sparse-test
+++ b/regress/tests/gigaslam-sparse-test
@@ -6,9 +6,7 @@
 TestName="gigaslam-sparse-test"
 JobName=SparseTest
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
 scripts/cleanup
 scripts/copy-test-confs
 echo "${cwd}/build" >/tmp/file-list
diff --git a/regress/tests/hardlink-test b/regress/tests/hardlink-test
index 42e38bcdde..05bdc1f148 100755
--- a/regress/tests/hardlink-test
+++ b/regress/tests/hardlink-test
@@ -6,7 +6,6 @@
 TestName="hardlink-test"
 JobName=hardlink
 . scripts/functions
-set_debug 0
 
 if test ! -d weird-files ; then
    echo " "
diff --git a/regress/tests/incremental-2disk b/regress/tests/incremental-2disk
index 7f99654e19..438685411c 100755
--- a/regress/tests/incremental-2disk
+++ b/regress/tests/incremental-2disk
@@ -8,7 +8,6 @@
 TestName="incremental-2disk"
 JobName=Inc2disk
 . scripts/functions
-set_debug 0
 
 . config.out
 
diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape
index 3b7264da77..2c5fd6d3a9 100755
--- a/regress/tests/incremental-tape
+++ b/regress/tests/incremental-tape
@@ -6,7 +6,6 @@
 TestName="incremental-tape"
 JobName=IncTape
 . scripts/functions
-set_debug 0
 
 copy_tape_confs
 
diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index 4678ef16c2..11ee94a6d9 100755
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -6,7 +6,6 @@
 TestName="incremental-test"
 JobName=Incremental 
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-test-confs
diff --git a/regress/tests/maxtime-test b/regress/tests/maxtime-test
index 210722db37..3168537445 100755
--- a/regress/tests/maxtime-test
+++ b/regress/tests/maxtime-test
@@ -7,7 +7,7 @@ TestName="maxtime-test"
 JobName=backup
 
 . scripts/functions
-set_debug 0
+
 copy_test_confs
 
 rm -f bin/bacula-dir.conf
@@ -77,4 +77,4 @@ else
    rstat=1
 fi
 
-end_test
\ No newline at end of file
+end_test
diff --git a/regress/tests/memory-bug-tape b/regress/tests/memory-bug-tape
index 8a85a43d20..af3811ac1e 100755
--- a/regress/tests/memory-bug-tape
+++ b/regress/tests/memory-bug-tape
@@ -8,7 +8,6 @@
 TestName="four-concurrent-jobs-tape"
 JobName=FourConcurrentJobs
 . scripts/functions
-set_debug 0
 
 scripts/cleanup-tape
 scripts/copy-tape-confs
diff --git a/regress/tests/migration-job-test b/regress/tests/migration-job-test
index 0b6cb19691..ab979daf84 100755
--- a/regress/tests/migration-job-test
+++ b/regress/tests/migration-job-test
@@ -8,7 +8,6 @@
 TestName="migration-job-test"
 JobName=MigrationJobSave
 . scripts/functions
-set_debug 0
 
 . config.out
 
diff --git a/regress/tests/migration-jobspan-test b/regress/tests/migration-jobspan-test
index 63a8ce1e0f..b81deac81b 100755
--- a/regress/tests/migration-jobspan-test
+++ b/regress/tests/migration-jobspan-test
@@ -10,7 +10,6 @@
 TestName="migration-jobspan-test"
 JobName=MigrationJobSpanSave
 . scripts/functions
-set_debug 0
 
 . config.out
 
diff --git a/regress/tests/migration-occupancy-test b/regress/tests/migration-occupancy-test
index aed2298afa..80f81cd01e 100755
--- a/regress/tests/migration-occupancy-test
+++ b/regress/tests/migration-occupancy-test
@@ -8,7 +8,6 @@
 TestName="migration-occupancy-test"
 JobName=MigrationJobSave
 . scripts/functions
-set_debug 0
 
 . config.out
 
diff --git a/regress/tests/migration-time-test b/regress/tests/migration-time-test
index 1adbb0e6d1..c817d75ed8 100755
--- a/regress/tests/migration-time-test
+++ b/regress/tests/migration-time-test
@@ -8,7 +8,6 @@
 TestName="migration-time-test"
 JobName=MigrationJobSave
 . scripts/functions
-set_debug 0
 
 . config.out
 
diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test
index eebdb1da85..0a75072156 100755
--- a/regress/tests/migration-volume-test
+++ b/regress/tests/migration-volume-test
@@ -8,7 +8,6 @@
 TestName="migration-volume-test"
 JobName=MigVolBackup
 . scripts/functions
-set_debug 0 
 
 . config.out
 
diff --git a/regress/tests/query-test b/regress/tests/query-test
index 43b450bc6e..e316ec0b76 100755
--- a/regress/tests/query-test
+++ b/regress/tests/query-test
@@ -7,7 +7,6 @@
 TestName="query-test"
 JobName=query
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-test-confs
diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index 244b0df2da..6017365a34 100755
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -8,9 +8,7 @@
 TestName="recycle-test"
 JobName=Recycle
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
 scripts/cleanup
 scripts/copy-test-confs
 echo "${cwd}/build" >/tmp/file-list
diff --git a/regress/tests/regexwhere-test b/regress/tests/regexwhere-test
index fa9f1ae375..80f15b94f0 100755
--- a/regress/tests/regexwhere-test
+++ b/regress/tests/regexwhere-test
@@ -7,7 +7,7 @@ TestName="regexwhere-test"
 JobName=backup
 
 . scripts/functions
-set_debug 0
+
 copy_test_confs
 
 rm -f bin/bacula-dir.conf
diff --git a/regress/tests/relabel-tape b/regress/tests/relabel-tape
index 68d14a7301..70516d2043 100755
--- a/regress/tests/relabel-tape
+++ b/regress/tests/relabel-tape
@@ -7,7 +7,6 @@
 TestName="relabel-tape"
 JobName=Relabeltape
 . scripts/functions
-set_debug 0
 
 scripts/cleanup-tape
 scripts/copy-tape-confs
diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape
index 98827959f5..7caf38f528 100755
--- a/regress/tests/restore-by-file-tape
+++ b/regress/tests/restore-by-file-tape
@@ -9,7 +9,6 @@
 TestName="restore-by-file-tape"
 JobName=restorebyfile
 . scripts/functions
-set_debug 0
 copy_tape_confs
 
 echo "${cwd}/build" >/tmp/file-list
diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test
index 16078fe638..93473f8b21 100755
--- a/regress/tests/restore-by-file-test
+++ b/regress/tests/restore-by-file-test
@@ -7,9 +7,7 @@
 TestName="restore-by-file-test"
 JobName=restorebyfile
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
 scripts/cleanup
 scripts/copy-test-confs
 echo "${cwd}/tmp/build" >/tmp/file-list
diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test
index 72183a659a..50b6474974 100755
--- a/regress/tests/restore-disk-seek-test
+++ b/regress/tests/restore-disk-seek-test
@@ -9,7 +9,6 @@
 TestName="restore-disk-seek-test"
 JobName=restore-disk-seek
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-test-confs
diff --git a/regress/tests/restore-seek-tape b/regress/tests/restore-seek-tape
index fe3fe3c42b..72c81b8f8f 100755
--- a/regress/tests/restore-seek-tape
+++ b/regress/tests/restore-seek-tape
@@ -9,7 +9,6 @@
 TestName="restore-seek-tape"
 JobName=restore-tape-seek
 . scripts/functions
-set_debug 0
 
 copy_tape_confs
 echo "${cwd}/tmp/build" >/tmp/file-list
diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test
index 77b4e375a5..f8dfc8f12e 100755
--- a/regress/tests/restore2-by-file-test
+++ b/regress/tests/restore2-by-file-test
@@ -6,7 +6,6 @@
 TestName="restore2-by-file-test"
 JobName=restore2byfile
 . scripts/functions
-set_debug 0
 copy_test_confs
 
 echo "${cwd}/build" >/tmp/file-list
diff --git a/regress/tests/runscript-test b/regress/tests/runscript-test
index e7557ef632..b9c8e54759 100755
--- a/regress/tests/runscript-test
+++ b/regress/tests/runscript-test
@@ -7,7 +7,6 @@ TestName="runscript-test"
 JobName=backup
 
 . scripts/functions
-set_debug 0
 copy_test_confs
 
 rm -f bin/bacula-dir.conf
diff --git a/regress/tests/scratch-pool-test b/regress/tests/scratch-pool-test
index f8fb24f88b..29c319ee70 100755
--- a/regress/tests/scratch-pool-test
+++ b/regress/tests/scratch-pool-test
@@ -14,7 +14,6 @@
 TestName="scratch-pool-test"
 JobName=scratch-pool
 . scripts/functions
-set_debug 0
 
 . config.out
 if test x${AUTOCHANGER} = x/dev/null ; then
diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index 32effb9b59..dad407b115 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"
diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape
index 9c68cad1eb..d03cba2133 100755
--- a/regress/tests/small-file-size-tape
+++ b/regress/tests/small-file-size-tape
@@ -6,7 +6,6 @@
 TestName="small-file-size-tape"
 JobName=smallfilesize
 . scripts/functions
-set_debug 0
 
 copy_tape_confs
 
diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test
index c5ec639540..645eb98e2f 100755
--- a/regress/tests/span-vol-test
+++ b/regress/tests/span-vol-test
@@ -8,9 +8,7 @@
 TestName="span-vol-test"
 JobName=SpanVol
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
 scripts/cleanup
 scripts/copy-test-confs
 echo "${cwd}/build" >/tmp/file-list
diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index bcbb6bfc4d..57947786b9 100755
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -6,7 +6,6 @@
 TestName="sparse-compressed-test"
 JobName=Sparse-conpressed
 . scripts/functions
-set_debug 0
 
 cwd=`pwd`
 scripts/cleanup
diff --git a/regress/tests/sparse-encrypt-test b/regress/tests/sparse-encrypt-test
index a3c9a6fce0..1a504ce127 100755
--- a/regress/tests/sparse-encrypt-test
+++ b/regress/tests/sparse-encrypt-test
@@ -5,7 +5,6 @@
 TestName="sparse-encrypt-test"
 JobName=Crypto
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-crypto-confs
diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index 9ff464af29..9d94c71892 100755
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -6,9 +6,7 @@
 TestName="sparse-test"
 JobName=SparseTest
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
 scripts/cleanup
 scripts/copy-test-confs
 echo "${cwd}/build" >/tmp/file-list
diff --git a/regress/tests/three-pool-test b/regress/tests/three-pool-test
index 043091de5e..2442773a1b 100755
--- a/regress/tests/three-pool-test
+++ b/regress/tests/three-pool-test
@@ -12,9 +12,6 @@ TestName="three-pool-disk"
 JobName="threepooldisk"
 . scripts/functions
 
-set_debug 1
-cwd=`pwd`
-
 scripts/cleanup
 scripts/copy-2disk-drive-confs
 scripts/prepare-two-disks
diff --git a/regress/tests/truncate-bug-tape b/regress/tests/truncate-bug-tape
index acfda15f3e..a97ba7c3b4 100755
--- a/regress/tests/truncate-bug-tape
+++ b/regress/tests/truncate-bug-tape
@@ -6,7 +6,6 @@ TestName="truncate-bug-tape"
 JobName=truncatebug
 . scripts/functions
 
-set_debug 0
 copy_tape_confs
 
 echo "${cwd}/build" >/tmp/file-list
diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index 9c20ca02c0..30817d65b3 100755
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -6,7 +6,6 @@
 TestName="two-jobs-test"
 JobName=Two-Jobs
 . scripts/functions
-set_debug 0
 
 cwd=`pwd`
 scripts/cleanup
diff --git a/regress/tests/two-pool-tape b/regress/tests/two-pool-tape
index 9da395ae69..f99709b067 100755
--- a/regress/tests/two-pool-tape
+++ b/regress/tests/two-pool-tape
@@ -10,7 +10,6 @@
 TestName="two-pool-tape"
 JobName=twopooltape
 . scripts/functions
-set_debug 0
 
 . config.out
 if test x${AUTOCHANGER} = x/dev/null ; then
diff --git a/regress/tests/two-pool-test b/regress/tests/two-pool-test
index 2b568f6c1e..9705ea242e 100755
--- a/regress/tests/two-pool-test
+++ b/regress/tests/two-pool-test
@@ -12,7 +12,6 @@
 TestName="two-pool-test"
 JobName=Two-pool
 . scripts/functions
-set_debug 0
 
 . config.out
 cwd=`pwd`
diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index a7ad2d591e..2e2d6455ce 100755
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -6,7 +6,6 @@
 TestName="two-vol-test"
 JobName=TwoVol
 . scripts/functions
-set_debug 0
 
 cwd=`pwd`
 scripts/cleanup
diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index a908e56206..4e5b547633 100755
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -8,7 +8,6 @@
 TestName="two-volume-tape"
 JobName=twovoltape
 . scripts/functions
-set_debug 0
 
 . config.out
 if test x${AUTOCHANGER} = x/dev/null ; then
diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test
index fdc3adcf96..2ad887be90 100755
--- a/regress/tests/two-volume-test
+++ b/regress/tests/two-volume-test
@@ -10,7 +10,6 @@
 TestName="two-volume-test"
 JobName=TwoVolume
 . scripts/functions
-set_debug 0
 . config.out
 
 cwd=`pwd`
diff --git a/regress/tests/verify-cat-test b/regress/tests/verify-cat-test
index 5c008a3ff4..6a43b48300 100755
--- a/regress/tests/verify-cat-test
+++ b/regress/tests/verify-cat-test
@@ -5,7 +5,6 @@
 TestName="verify-cat-test"
 JobName=VerifyCatalog
 . scripts/functions
-set_debug 0
 
 cwd=`pwd`
 scripts/cleanup
diff --git a/regress/tests/verify-vol-tape b/regress/tests/verify-vol-tape
index c544bc6603..ffc6d02fe2 100755
--- a/regress/tests/verify-vol-tape
+++ b/regress/tests/verify-vol-tape
@@ -6,7 +6,6 @@
 TestName="verify-vol-tape"
 JobName=VerifyVol
 . scripts/functions
-set_debug 0
 
 copy_tape_confs
 
diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index af899b4de0..ba25045817 100755
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -6,7 +6,6 @@
 TestName="verify-vol-test"
 JobName=VerifyVol
 . scripts/functions
-set_debug 0
 
 cwd=`pwd`
 scripts/cleanup
diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index fea5007f40..3ef08d2cc1 100755
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -6,7 +6,6 @@
 TestName="weird-files-test"
 JobName=wierd-files
 . scripts/functions
-set_debug 0
 
 if test ! -d weird-files ; then
    echo " "
diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index 221abbf075..16f9120d57 100755
--- a/regress/tests/weird-files2-test
+++ b/regress/tests/weird-files2-test
@@ -6,7 +6,6 @@
 TestName="weird-files2-test"
 JobName=weird-files2
 . scripts/functions
-set_debug 0
 
 if test ! -d weird-files ; then
    echo " "
diff --git a/regress/tests/win32-backup-tape b/regress/tests/win32-backup-tape
index 3322da8d49..aa7d5bfdcf 100755
--- a/regress/tests/win32-backup-tape
+++ b/regress/tests/win32-backup-tape
@@ -7,7 +7,6 @@
 TestName="win32-backup-tape"
 JobName=win32tape
 . scripts/functions
-set_debug 0
 
 scripts/copy-win32-confs
 scripts/cleanup-tape
diff --git a/regress/tests/win32-to-linux-tape b/regress/tests/win32-to-linux-tape
index 5640e9f9ec..167b9d325d 100755
--- a/regress/tests/win32-to-linux-tape
+++ b/regress/tests/win32-to-linux-tape
@@ -7,7 +7,6 @@
 TestName="win32-to-linux-tape"
 JobName=AutoLabel
 . scripts/functions
-set_debug 0
 
 scripts/copy-win32-confs
 scripts/cleanup-tape
-- 
2.39.5