ebl revert pool changes and correct the problem

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8726 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/scripts/functions b/regress/scripts/functions
index aca9193a11b190d04f877fa9c1f31e14963a5dde..d4105a8fe6c01c8ca6b8de61b2a1715e3c9fe9d8 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -5,7 +5,7 @@
 
 check_encoding()
 {
-   $bin/bacula-dir -d50 -t -c $cwd/scripts/bacula-dir.conf 2>&1 | grep 'Wanted SQL_ASCII, got UTF8' >/dev/null
+   $bin/bacula-dir -d50 -t -c bin/bacula-dir.conf 2>&1 | grep 'Wanted SQL_ASCII, got UTF8' >/dev/null
    if [ $? = 0 ]; then
        echo "Found database encoding problem, please modify the database encoding (SQL_ASCII)"
        exit 1

diff --git a/regress/tests/big-vol-test b/regress/tests/big-vol-test
index 8b6a5a878367e6b1723e2dc2aa4c142117c6249e..21e4167737db407728a4794c629bb85c51c3a1a5 100755 (executable)
--- a/regress/tests/big-vol-test
+++ b/regress/tests/big-vol-test
@@ -21,7 +21,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 messages
 @$out ${cwd}/tmp/log1.out
 @#setdebug level=100 storage=File
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/broken-media-bug-test b/regress/tests/broken-media-bug-test
index 42293d07511b6cde5943ddb2403635dc32d7f6fa..3e6aa51a457eac0e6313a5e02989d67c0e5fbbce 100644 (file)
--- a/regress/tests/broken-media-bug-test
+++ b/regress/tests/broken-media-bug-test
@@ -38,8 +38,8 @@ messages
 @$out tmp/log1.out
 setdebug level=150  storage=File
 setdebug level=150  Director
-label storage=File volume=TestVolume0001 pool=Default
-label storage=File volume=TestVolume0002 pool=Default
+label storage=File volume=TestVolume0001
+label storage=File volume=TestVolume0002
 run job=First yes
 messages
 quit

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index 14669e88e08e6b17d11cabed761cdf011b45ecb1..20ac940a3eba22d353c93ce80f1e9b366fad5344 100755 (executable)
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -21,9 +21,9 @@ cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log1.out
-label storage=File1 pool=Default
+label storage=File1
 TestVolume001
-label storage=File1 pool=Default
+label storage=File1
 TestVolume002
 update Volume=TestVolume001 MaxVolBytes=3000000
 run job=$JobName storage=File1

diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index 8b9c8758dace371875859d69799cd2a7098b7e28..068ae1092734c2b7e1826831bd630f3d2edb88cd 100755 (executable)
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -21,8 +21,8 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File1 volume=TestVolume001 pool=Default
-label storage=File1 volume=TestVolume002 pool=Default
+label storage=File1 volume=TestVolume001
+label storage=File1 volume=TestVolume002
 update Volume=TestVolume001 MaxVolBytes=3000000
 run job=$JobName storage=File1 yes
 wait

diff --git a/regress/tests/bug-897 b/regress/tests/bug-897
index f38dd97dff1442aa717dbfd4bd650787ad2d1704..4b9de5438b46ed09f752099320f8315759e37970 100755 (executable)
--- a/regress/tests/bug-897
+++ b/regress/tests/bug-897
@@ -32,7 +32,7 @@ start_test
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
-label volume=TestVolume001 pool=Default
+label volume=TestVolume001
 @$out ${cwd}/tmp/RUN_FD_FAILED.log
 run job=RUN_FD_FAILED yes
 wait

diff --git a/regress/tests/bug-fatal-test b/regress/tests/bug-fatal-test
index a0b1f0cf2a8d1eb1f6f7dd813df383ce40d48914..06776578100938628c23e86b45f4f85ca1d68b6b 100755 (executable)
--- a/regress/tests/bug-fatal-test
+++ b/regress/tests/bug-fatal-test
@@ -23,7 +23,7 @@ start_test
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
-label volume=TestVolume001 pool=Default
+label volume=TestVolume001
 @$out ${cwd}/tmp/RUN_BUG_FATAL.log
 run job=BUG_FATAL yes
 wait

diff --git a/regress/tests/compress-encrypt-test b/regress/tests/compress-encrypt-test
index 77e858acabed534ce418270f75a6656623a266bc..d4eb0cae521f763dd9ca67904e3f414542c347f1 100755 (executable)
--- a/regress/tests/compress-encrypt-test
+++ b/regress/tests/compress-encrypt-test
@@ -17,7 +17,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 setdebug level=10 fd
 run job=$JobName yes
 wait

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index 229a5b12141a4b3813b6ce37caec2659f4cfaacc..47fc8e4362e392ccc39957cab40a26915de8a190 100755 (executable)
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -21,7 +21,7 @@ messages
 status all
 status all
 messages
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 run job=$JobName storage=File yes
 wait
 messages

diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test
index ca643677d15eeb06d0c95d2893df18e33905bc92..8726113f27d5b869dc49af79054cc1f7a974be65 100755 (executable)
--- a/regress/tests/concurrent-jobs-test
+++ b/regress/tests/concurrent-jobs-test
@@ -34,7 +34,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out  ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 run job=$JobName level=Full yes
 run job=$JobName level=Full yes
 run job=$JobName level=Full yes

diff --git a/regress/tests/data-encrypt-test b/regress/tests/data-encrypt-test
index f0dfd2f0be8a572d0af539a8b2e22a1e6f893bf8..581b8a219cb42b332f9660b320faf30603b151c7 100755 (executable)
--- a/regress/tests/data-encrypt-test
+++ b/regress/tests/data-encrypt-test
@@ -19,7 +19,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 @#setdebug level=10 fd
 run job=$JobName yes
 wait

diff --git a/regress/tests/debug-test b/regress/tests/debug-test
index e4c3c324220711460dee719db8c373ccccd4adac..f1e95362dad3c19639c81bcfb2aee0749d3f7a87 100755 (executable)
--- a/regress/tests/debug-test
+++ b/regress/tests/debug-test
@@ -17,7 +17,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File1 volume=TestVolume001 pool=Default
+label storage=File1 volume=TestVolume001
 update volume=TestVolume001 MaxVolBytes=1000
 run job=$JobName storage=File1 yes
 @sleep 5

diff --git a/regress/tests/dev-test-root b/regress/tests/dev-test-root
index cab86fc0fd7200aa788af38798e2c640674cc0c0..0d005e56b7f0a21d970504406586f00152e9288f 100755 (executable)
--- a/regress/tests/dev-test-root
+++ b/regress/tests/dev-test-root
@@ -19,7 +19,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @output ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 run job=NightlySave yes
 wait
 messages

diff --git a/regress/tests/differential-test b/regress/tests/differential-test
index df9b49fd916f3cfb67f94c9bfc0e8513a1049f0a..4d95637a5898d786f25c73a3ac39e3cf63a17f0e 100755 (executable)
--- a/regress/tests/differential-test
+++ b/regress/tests/differential-test
@@ -25,8 +25,8 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 messages
 @$out ${cwd}/tmp/log1.out
 setdebug level=100 storage=File
-label storage=File volume=TestVolume002 pool=Default
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume002
+label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/encrypt-bug-test b/regress/tests/encrypt-bug-test
index fa0d2393d55d23fed58f00321ed01f5b0ed332e2..93f2b2ef3502a4128ffddde955ab38badfbb0683 100755 (executable)
--- a/regress/tests/encrypt-bug-test
+++ b/regress/tests/encrypt-bug-test
@@ -28,7 +28,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 setdebug level=100 fd
 run job=$JobName yes
 wait

diff --git a/regress/tests/errors-test b/regress/tests/errors-test
index a3f028823c7c8c09a2652ba391e60d6001bfed94..5a57c42350469daa97670d8ced79b7cb1cc2c6b7 100755 (executable)
--- a/regress/tests/errors-test
+++ b/regress/tests/errors-test
@@ -21,7 +21,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @output ${cwd}/tmp/LOCAL_INC_ERR.log
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 add storage=File2
 1
 File2

diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root
index 6be6fad540ef2c0d9b370366989ec5660b53d315..50a45f2cbf719fccbeb5e5b73b76118204add51a 100755 (executable)
--- a/regress/tests/etc-test-root
+++ b/regress/tests/etc-test-root
@@ -16,7 +16,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @output ${cwd}/tmp/log1.out
-label storage=File pool=Default
+label storage=File
 TestVolume001
 run job=NightlySave
 yes

diff --git a/regress/tests/fifo-test b/regress/tests/fifo-test
index 5b35b0992dd4a4fbacb384139250ac0df9827ae0..c0dcd4232fada43e36827570ce5e7733289954c3 100755 (executable)
--- a/regress/tests/fifo-test
+++ b/regress/tests/fifo-test
@@ -22,7 +22,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File1 volume=TestVolume001 pool=Default
+label storage=File1 volume=TestVolume001
 run job=$JobName storage=File1 yes
 wait
 messages

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 58d38d89b4205fad4d861e434d88a63355f633e4..6f10087dbc14b8ab2158bf3e873f352ce690273b 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -20,9 +20,9 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out   ${cwd}/tmp/log1.out
-label storage=File1 pool=Default
+label storage=File1
 TestVolume001
-label storage=File1 pool=Default
+label storage=File1
 TestVolume002
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index eb2a8b666b1ffccc0b4ee8974d7ede514fb867ea..b13a3ddd930e20ecbcdea2a35625640d1eb22ca3 100755 (executable)
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -22,7 +22,7 @@ estimate job=$JobName
 estimate job=$JobName
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/gigaslam-sparse-test b/regress/tests/gigaslam-sparse-test
index ce07f169479b4c56b9f9ad7b1fb020f965b4c45e..f3b560af07c878d473ac1bdfb02a3467be3d6082 100755 (executable)
--- a/regress/tests/gigaslam-sparse-test
+++ b/regress/tests/gigaslam-sparse-test
@@ -25,7 +25,7 @@ cat >${cwd}/tmp/bconcmds <<END_OF_DATA
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/hardlink-test b/regress/tests/hardlink-test
index db89fe1b1427119fb8171bb509829f76c047d07e..f556f889d453015a455c2b0ebae25dea2bd5fb47 100755 (executable)
--- a/regress/tests/hardlink-test
+++ b/regress/tests/hardlink-test
@@ -32,7 +32,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File pool=Default
+label storage=File
 TestVolume001
 run job=$JobName    
 yes

diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index 9e2e1b60162df57866c7abb55adf5af14c4300f1..f41a84fe3ead6228d251d1932808ad63d9582f6d 100755 (executable)
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -25,8 +25,8 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 messages
 @$out ${cwd}/tmp/log1.out
 @#setdebug level=100 storage=File
-label storage=File volume=TestVolume001 pool=Default
-label storage=File volume=TestVolume002 pool=Default
+label storage=File volume=TestVolume001
+label storage=File volume=TestVolume002
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/lib-tape-root b/regress/tests/lib-tape-root
index 5f792c064d76fa8aa0d33107ee5fe79ea61998fa..9044d1c088c7968967fe6d4373d6941834c249bd 100755 (executable)
--- a/regress/tests/lib-tape-root
+++ b/regress/tests/lib-tape-root
@@ -19,7 +19,7 @@ cat <<END_OF_DATA > >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @output ${cwd}/tmp/log1.out
-label storage=DDS-4 Volume=TestVolume001 slot=0 pool=Default
+label storage=DDS-4 Volume=TestVolume001 slot=0
 run job=NightlySave yes
 wait
 messages

diff --git a/regress/tests/lib-test-root b/regress/tests/lib-test-root
index 739e042acbccd759a49183c41e497f27c09fc8b4..54da62c7d459c72119abcf6d8e2afbb9c562b47b 100755 (executable)
--- a/regress/tests/lib-test-root
+++ b/regress/tests/lib-test-root
@@ -19,7 +19,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @output ${cwd}/tmp/log1.out
-label storage=File pool=Default
+label storage=File
 TestVolume001
 run job=NightlySave
 yes

diff --git a/regress/tests/maxtime-test b/regress/tests/maxtime-test
index c444cdc432c09e3ff2b61494a93df84feb744e84..5aa031e8487a1a8ecca235518eac51db97636817 100755 (executable)
--- a/regress/tests/maxtime-test
+++ b/regress/tests/maxtime-test
@@ -26,7 +26,6 @@ label volume=TestVolume001 pool=PoolA
 @# no media => have to wait
 run job=RUN_MAXWAITTIME pool=Default yes
 @sleep 2
-wait
 @# storage is used by RUN_MAXWAITTIME => have to wait
 run job=RUN_MAXSTARTDELAY pool=PoolA when="$WHEN" yes
 @sleep 60
@@ -34,7 +33,6 @@ label volume=TestVolume002 pool=Default
 mount
 wait
 messages
-setdebug level=200 dir
 run job=RUN_MAXRUNTIME pool=PoolA yes
 wait
 messages

diff --git a/regress/tests/maxvol-test b/regress/tests/maxvol-test
index e9e9dba95580c1f033c61eaaea96069b46297cc8..a671c0b3d20c2b3ab3f55882147e60f936869790 100755 (executable)
--- a/regress/tests/maxvol-test
+++ b/regress/tests/maxvol-test
@@ -24,10 +24,10 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out   ${cwd}/tmp/log1.out
-label storage=File1 volume=TestVolume001 pool=Default
-label storage=File1 volume=TestVolume002 pool=Default
-label storage=File1 volume=TestVolume003 pool=Default
-label storage=File1 volume=TestVolume004 pool=Default
+label storage=File1 volume=TestVolume001
+label storage=File1 volume=TestVolume002
+label storage=File1 volume=TestVolume003
+label storage=File1 volume=TestVolume004
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
 @#12

diff --git a/regress/tests/maxvol2-test b/regress/tests/maxvol2-test
index c8f5db0dd78828a2ac5054e6781c861fcc790ad1..7fe6c2befee6ed51abf9d830063ae0b864e4e8a5 100755 (executable)
--- a/regress/tests/maxvol2-test
+++ b/regress/tests/maxvol2-test
@@ -20,9 +20,9 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File1 volume=TestVolume001 pool=Default
-label storage=File1 volume=TestVolume002 pool=Default
-label storage=File1 volume=TestVolume003 pool=Default
+label storage=File1 volume=TestVolume001
+label storage=File1 volume=TestVolume002
+label storage=File1 volume=TestVolume003
 update Volume=TestVolume001 volretention=10s
 update Volume=TestVolume001 maxvoljobs=1
 update Volume=TestVolume002 volretention=10s

diff --git a/regress/tests/multi-client-test b/regress/tests/multi-client-test
index 01c9bdd2e884e1b757c33477db8d24429571d0e1..fb61105d19e927bf545e21abdef9dcbd70998612 100755 (executable)
--- a/regress/tests/multi-client-test
+++ b/regress/tests/multi-client-test
@@ -27,9 +27,9 @@ status client=${hostname1}-fd
 status client=${hostname2}-fd
 status client=${hostname3}-fd
 setdebug level=1 dir
-label storage=File1 pool=Default
+label storage=File1
 TestVolume001
-label storage=File1 pool=Default
+label storage=File1
 TestVolume002
 update Volume=TestVolume001 MaxVolBytes=900000000
 status storage=File1

diff --git a/regress/tests/plugin-test b/regress/tests/plugin-test
index 8bdfad1de949b66abb335fc11a868500b8b9a933..a7aa70538e36ea080580b02f00ca964efdc49de5 100755 (executable)
--- a/regress/tests/plugin-test
+++ b/regress/tests/plugin-test
@@ -18,7 +18,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File1 volume=TestVolume001 pool=Default
+label storage=File1 volume=TestVolume001
 setdebug level=150 client=$CLIENT
 estimate job=$JobName level=Full
 setdebug level=50 client=$CLIENT

diff --git a/regress/tests/query-test b/regress/tests/query-test
index 64bf87ce70903ee9c763a39b21a52ae4fcbd03d8..a4d365e1fe5e9a9046fba14d3eb159d92ac569af 100755 (executable)
--- a/regress/tests/query-test
+++ b/regress/tests/query-test
@@ -25,8 +25,8 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
-label storage=File volume=TestVolume002 pool=Default
+label storage=File volume=TestVolume001
+label storage=File volume=TestVolume002
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index bc822fe41cd7fab334372d103eca215e3bc98b65..701a0083e78fd0f5b7fad47cba4d2c7ac07981e9 100755 (executable)
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -25,10 +25,10 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File1 volume=TestVolume001 pool=Default
-label storage=File1 volume=TestVolume002 pool=Default
-label storage=File1 volume=TestVolume003 pool=Default
-label storage=File1 volume=TestVolume004 pool=Default
+label storage=File1 volume=TestVolume001
+label storage=File1 volume=TestVolume002
+label storage=File1 volume=TestVolume003
+label storage=File1 volume=TestVolume004
 @# Note, this is going to fail if the pruning gets
 @#  to tight because the saved volume is too large.
 @#  In that case, either add another volume, or

diff --git a/regress/tests/regexwhere-test b/regress/tests/regexwhere-test
index 8b3d2f43606eaa72ec2b2bbc7ef3dba43cb54f75..5d6ffc488481af07a124a92c6ac473a251bea69b 100755 (executable)
--- a/regress/tests/regexwhere-test
+++ b/regress/tests/regexwhere-test
@@ -30,7 +30,7 @@ start_test
 cat <<END_OF_DATA >tmp/bconcmds
 @$out tmp/RUN_backup
 messages
-label volume=TestVolume001 pool=Default
+label volume=TestVolume001
 run job=backup yes
 wait
 messages

diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test
index 1beca6012f01f6c5a48c074d5011b35cc7638821..04b448d82dfcbd529334bca2d8a9725e43c8aefe 100755 (executable)
--- a/regress/tests/restore-by-file-test
+++ b/regress/tests/restore-by-file-test
@@ -27,7 +27,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test
index ecc31df5700c774f5015a0451826e4b7e219f28c..38fc0f7b7ba781e30fbb43bcb2b19df6d93c1256 100755 (executable)
--- a/regress/tests/restore-disk-seek-test
+++ b/regress/tests/restore-disk-seek-test
@@ -52,7 +52,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test
index 1e5f00df078eeaf838fbd2571093a3332a03e31e..1a4553ab14693a0ecfe2edefd1afee0e35260934 100755 (executable)
--- a/regress/tests/restore2-by-file-test
+++ b/regress/tests/restore2-by-file-test
@@ -18,7 +18,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test
index 6f2b4d58fe74f9d6a1f6ac377d3f36af901c4eb7..d687c7d5268bc038e87f1540848371dbdfbbca77 100755 (executable)
--- a/regress/tests/span-vol-test
+++ b/regress/tests/span-vol-test
@@ -20,10 +20,10 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File1 volume=TestVolume004 pool=Default
-label storage=File1 volume=TestVolume003 pool=Default
-label storage=File1 volume=TestVolume002 pool=Default
-label storage=File1 volume=TestVolume001 pool=Default
+label storage=File1 volume=TestVolume004
+label storage=File1 volume=TestVolume003
+label storage=File1 volume=TestVolume002
+label storage=File1 volume=TestVolume001
 update Volume=TestVolume004 MaxVolBytes=3000000
 update Volume=TestVolume003 MaxVolBytes=3000000
 update Volume=TestVolume002 MaxVolBytes=3000000

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index fa25d47cbd1c554e3d20bb77c424f80abeaa0c91..47e05e41c179819678fc5702212ba79406e3c5ff 100755 (executable)
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -18,7 +18,7 @@ cat >${cwd}/tmp/bconcmds <<END_OF_DATA
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 run job=SparseCompressedTest yes
 wait
 messages

diff --git a/regress/tests/sparse-encrypt-test b/regress/tests/sparse-encrypt-test
index 198342a8a82fb1f542da05a20830e37ebfa44b50..865b739b49da841a6ab528cf4605870b4641a377 100755 (executable)
--- a/regress/tests/sparse-encrypt-test
+++ b/regress/tests/sparse-encrypt-test
@@ -25,7 +25,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 setdebug level=10 fd
 run job=$JobName yes
 wait

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index 0c64b34bbe68d0732915513591e138b0d71a9bb8..38d12fd9989e4d83a5e96944376fcaad79274eb0 100755 (executable)
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -17,7 +17,7 @@ cat >${cwd}/tmp/bconcmds <<END_OF_DATA
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index f87aa55cc31a25dd24626e75c34700010352b805..b8f8e8f87fc80f7b3175c11acf5e7d894fbe81be 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -25,7 +25,7 @@ estimate job=$JobName
 estimate job=$JobName
 messages
 @$out tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index 50d7bde8ac702b9950fc8e999700048593a5b68b..15f48ee5b24f32fd013182af366dee528707f12f 100755 (executable)
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -19,8 +19,8 @@ cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log1.out
-label storage=File1 volume=TestVolume002 pool=Default
-label storage=File1 volume=TestVolume001 pool=Default
+label storage=File1 volume=TestVolume002
+label storage=File1 volume=TestVolume001
 update Volume=TestVolume002 MaxVolBytes=3000000
 run job=$JobName storage=File1 yes
 wait

diff --git a/regress/tests/usr-tape-root b/regress/tests/usr-tape-root
index 7493dfb472b51bdebda7f647dbd2cbc6be12f69d..8d551aca6630e3002829815b4e385399c7bec270 100755 (executable)
--- a/regress/tests/usr-tape-root
+++ b/regress/tests/usr-tape-root
@@ -19,7 +19,7 @@ cat <<END_OF_DATA > ${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @output tmp/log1.out
-label storage=DDS-4 Volume=TestVolume001 slot=0 pool=Default
+label storage=DDS-4 Volume=TestVolume001 slot=0
 run job=NightlySave yes
 wait
 messages

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index c1ac0011dca8d723630f524cbc4c8f6336dbe124..c51228d8ea8957675324923c0a33a15ea2750462 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -26,7 +26,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @$out tmp/log1.out
 setdebug level=1 storage=File sd
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/verify-voltocat-test b/regress/tests/verify-voltocat-test
index 28f69d1ad49fb6ef3bc992a4806299d4a9b03f00..1cf26d7baa076d54b933bc31409208b6e65672eb 100755 (executable)
--- a/regress/tests/verify-voltocat-test
+++ b/regress/tests/verify-voltocat-test
@@ -31,7 +31,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @$out tmp/log1.out
 setdebug level=1 storage=File sd
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/virtual-backup2-test b/regress/tests/virtual-backup2-test
index 9aea202d0990f5fba4643f27b9e0b019f789f514..6563a9170f6a375fd2cde0c495fb2bc211bfdd12 100755 (executable)
--- a/regress/tests/virtual-backup2-test
+++ b/regress/tests/virtual-backup2-test
@@ -5,7 +5,7 @@
 #
 # This script uses the virtual disk autochanger
 #
-TestName="virtual-backup2-test"
+TestName="virtual-backup-test"
 JobName=Vbackup
 . scripts/functions
 

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 75049b77821731357417386ed245cf03558159b7..920ca7c60a8d822cc1aa87736df84559e7572ffe 100755 (executable)
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -37,7 +37,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log1.out
-label storage=File pool=Default
+label storage=File
 TestVolume001
 run job=$JobName    
 yes

diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index 7616cc71d973f6dc37d1a123b1fc0ebe80c0a051..9a8e1dce3b0964b587ec0b36f456efc6a5f4af84 100755 (executable)
--- a/regress/tests/weird-files2-test
+++ b/regress/tests/weird-files2-test
@@ -31,7 +31,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log1.out
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
 messages

diff --git a/regress/tests/win32-test b/regress/tests/win32-test
index 5718a22c06ee04846d69bc5a7c3c73af67a1c77d..9f1568b62cf2864723fe33f9ef88c424d8a6ea94 100755 (executable)
--- a/regress/tests/win32-test
+++ b/regress/tests/win32-test
@@ -21,7 +21,7 @@ messages
 status all
 status all
 messages
-label storage=File volume=TestVolume001 pool=Default
+label storage=File volume=TestVolume001
 setdebug level=100 dir
 run job=$JobName storage=File yes
 wait