Backport regress scripts

diff --git a/regress/tests/2drive-2disk b/regress/tests/2drive-2disk
index f590f37981379bafe956f911f4b3d0afd6513466..7bebc9d77d2e551c36480b9ecb1d56c19a60093b 100755 (executable)
--- a/regress/tests/2drive-2disk
+++ b/regress/tests/2drive-2disk
@@ -1,9 +1,7 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
-#
-
 #
 # Run a simple backup of the Bacula build directory then create some           
 #   new files, do an Incremental and restore those two files.
@@ -38,13 +36,13 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-setdebug level=3 dir
-setdebug level=3 storage=tape
-setdebug level=3 client=$CLIENT
+setdebug level=3 dir trace=1
+setdebug level=3 storage=tape trace=1
+setdebug level=3 client=$CLIENT trace=1
 label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=1
 # label storage=tape volume=TestVolume002 slot=2 Pool=Default drive=1
 status storage=tape
-setdebug level=120 storage=tape
+setdebug level=120 storage=tape trace=1
 run job=NightlySave level=Full yes
 @sleep 1
 run job=NightlySave level=Full yes

diff --git a/regress/tests/2drive-2job-test b/regress/tests/2drive-2job-test
index 689c8226ac0c26cc7692fd2778c007583909acc0..dcf74d480cd202ba942de973b58de3af3735a41e 100755 (executable)
--- a/regress/tests/2drive-2job-test
+++ b/regress/tests/2drive-2job-test
@@ -1,9 +1,7 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
-#
-
 #
 # Set prefer mounted volumes to no to try to force use of
 #   the drive swap code.
@@ -45,7 +43,7 @@ status storage=tape
 @#mount storage=tape slot=2 drive=0
 @#mount storage=tape slot=1 drive=1
 status storage=tape
-setdebug level=120 storage=tape
+setdebug level=120 trace=1 storage=tape
 run job=$JobName level=Full yes
 @sleep 2
 run job=$JobName level=Full yes

diff --git a/regress/tests/2drive-3pool-test b/regress/tests/2drive-3pool-test
index 17ec8dc1082a38dc9747ccd7d7b7f4fb891042fc..112a61ffd5e311240a382de5eacd465e0aaa16d1 100755 (executable)
--- a/regress/tests/2drive-3pool-test
+++ b/regress/tests/2drive-3pool-test
@@ -1,9 +1,7 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
-#
-
 #
 # Run a simple backup of the Bacula build directory. Create three
 #   tapes, each in a different pool, then run some jobs asking for the

diff --git a/regress/tests/2drive-concurrent-test b/regress/tests/2drive-concurrent-test
index 77ae4906c30a42ad68ea14028cc8fb4fbab21cc2..513ff4f73408dc8a82ff553282c893092caca71b 100755 (executable)
--- a/regress/tests/2drive-concurrent-test
+++ b/regress/tests/2drive-concurrent-test
@@ -1,9 +1,7 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# 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

diff --git a/regress/tests/2drive-incremental-2disk b/regress/tests/2drive-incremental-2disk
index 0c8c67ea0e329ef65b871eed656e1f6f4c4ab7f9..2d209107e5a872d5a96fa3fba7ca5c1c9ddb5ef8 100755 (executable)
--- a/regress/tests/2drive-incremental-2disk
+++ b/regress/tests/2drive-incremental-2disk
@@ -1,9 +1,7 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
-#
-
 #
 # Run a simple backup of the Bacula build directory then create some           
 #   new files, do an Incremental and restore those two files.
@@ -45,13 +43,13 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-setdebug level=3 dir
-setdebug level=3 storage=tape
-setdebug level=3 client=2drive2disk 
+setdebug trace=1 level=3 dir
+setdebug trace=1 level=3 storage=tape
+setdebug trace=1 level=3 client=2drive2disk 
 label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=tape volume=TestVolume002 slot=2 Pool=Default drive=1
 status storage=tape
-setdebug level=200 storage=tape
+setdebug trace=1 level=200 storage=tape
 run job=NightlySave yes
 run job=NightlySave yes
 run job=NightlySave yes

diff --git a/regress/tests/2drive-incremental-changer b/regress/tests/2drive-incremental-changer
index 76d4d61ba82a4b2fcf8821e69989a4ffa05704dc..0113ae4bfb1960fb4d805f99f347c2320aa00e18 100755 (executable)
--- a/regress/tests/2drive-incremental-changer
+++ b/regress/tests/2drive-incremental-changer
@@ -1,9 +1,7 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
-#
-
 #
 # Run a simple backup of the Bacula build directory then create some           
 #   new files, do an Incremental and restore those two files.

diff --git a/regress/tests/2drive-swap-test b/regress/tests/2drive-swap-test
index 39ead781c160ec33cea99c63eec96d5b920c258e..451e61d32c80e31630757487196d9e595ad23f33 100755 (executable)
--- a/regress/tests/2drive-swap-test
+++ b/regress/tests/2drive-swap-test
@@ -1,9 +1,7 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
-#
-
 #
 # Set prefer mounted volumes to no to try to force use of
 #   the drive swap code.

diff --git a/regress/tests/2media-virtual-test b/regress/tests/2media-virtual-test
index 571c2e5767181a60cdfb917c4d5d192736619f23..525d93fdea7f8e9403e8e78d4af9c93c88b2318b 100755 (executable)
--- a/regress/tests/2media-virtual-test
+++ b/regress/tests/2media-virtual-test
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2017 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # Test running a Virtual disk changer with two Media Types
@@ -17,6 +17,7 @@ ${rscripts}/cleanup
 cp -f ${rscripts}/bacula-dir-2media-virtual.conf ${conf}/bacula-dir.conf
 cp -f ${rscripts}/bacula-sd-2media-virtual.conf ${conf}/bacula-sd.conf
 cp -f ${rscripts}/test-bacula-fd.conf ${conf}/bacula-fd.conf
+cp -f ${rscripts}/test-console.conf ${conf}/bconsole.conf
 rm -rf ${tmp}/disk ${tmp}/disk1
 mkdir -p ${tmp}/disk ${tmp}/disk1
 
@@ -32,8 +33,8 @@ messages
 @#setdebug level=15 storage=Virtual
 @#setdebug level=200 client
 @#setdebug level=100 director
-label storage=Virtual pool=Default volume=TestVolume001 drive=0 slot=0
-label Storage=vDrive-3 pool=Default volume=TestVolume002 drive=2 slot=0
+label storage=Virtual volume=TestVolume001 pool=Default drive=0 slot=0
+label Storage=vDrive-3 volume=TestVolume002 pool=Default drive=2 slot=0
 run job=$JobName level=Full storage=Virtual yes
 wait
 update volume=TestVolume001 volstatus=Used actiononpurge=truncate
@@ -45,8 +46,8 @@ llist volume=TestVolume001
 purge volume=TestVolume001
 update volume=TestVolume002 volstatus=Used actiononpurge=truncate
 purge volume=TestVolume002
-purge volume action=truncate pool=Default storage=Virtual drive=0
-purge volume action=truncate pool=Default storage=Virtual drive=2
+purge volume action=truncate storage=Virtual drive=0 pool=Default
+purge volume action=truncate storage=Virtual drive=2 pool=Default
 list volumes
 quit
 END_OF_DATA