From 953a514846084712f785a5cd814bf3d58960e95d Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Tue, 14 Apr 2009 09:35:11 +0000 Subject: [PATCH] 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 --- regress/scripts/functions | 2 +- regress/tests/big-vol-test | 2 +- regress/tests/broken-media-bug-test | 4 ++-- regress/tests/bscan-test | 4 ++-- regress/tests/bsr-opt-test | 4 ++-- regress/tests/bug-897 | 2 +- regress/tests/bug-fatal-test | 2 +- regress/tests/compress-encrypt-test | 2 +- regress/tests/compressed-test | 2 +- regress/tests/concurrent-jobs-test | 2 +- regress/tests/data-encrypt-test | 2 +- regress/tests/debug-test | 2 +- regress/tests/dev-test-root | 2 +- regress/tests/differential-test | 4 ++-- regress/tests/encrypt-bug-test | 2 +- regress/tests/errors-test | 2 +- regress/tests/etc-test-root | 2 +- regress/tests/fifo-test | 2 +- regress/tests/four-concurrent-jobs-test | 4 ++-- regress/tests/four-jobs-test | 2 +- regress/tests/gigaslam-sparse-test | 2 +- regress/tests/hardlink-test | 2 +- regress/tests/incremental-test | 4 ++-- regress/tests/lib-tape-root | 2 +- regress/tests/lib-test-root | 2 +- regress/tests/maxtime-test | 2 -- regress/tests/maxvol-test | 8 ++++---- regress/tests/maxvol2-test | 6 +++--- regress/tests/multi-client-test | 4 ++-- regress/tests/plugin-test | 2 +- regress/tests/query-test | 4 ++-- regress/tests/recycle-test | 8 ++++---- regress/tests/regexwhere-test | 2 +- regress/tests/restore-by-file-test | 2 +- regress/tests/restore-disk-seek-test | 2 +- regress/tests/restore2-by-file-test | 2 +- regress/tests/span-vol-test | 8 ++++---- regress/tests/sparse-compressed-test | 2 +- regress/tests/sparse-encrypt-test | 2 +- regress/tests/sparse-test | 2 +- regress/tests/two-jobs-test | 2 +- regress/tests/two-vol-test | 4 ++-- regress/tests/usr-tape-root | 2 +- regress/tests/verify-vol-test | 2 +- regress/tests/verify-voltocat-test | 2 +- regress/tests/virtual-backup2-test | 2 +- regress/tests/weird-files-test | 2 +- regress/tests/weird-files2-test | 2 +- regress/tests/win32-test | 2 +- 49 files changed, 68 insertions(+), 70 deletions(-) diff --git a/regress/scripts/functions b/regress/scripts/functions index aca9193a11..d4105a8fe6 100644 --- 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 8b6a5a8783..21e4167737 100755 --- a/regress/tests/big-vol-test +++ b/regress/tests/big-vol-test @@ -21,7 +21,7 @@ cat <${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 42293d0751..3e6aa51a45 100644 --- 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 14669e88e0..20ac940a3e 100755 --- a/regress/tests/bscan-test +++ b/regress/tests/bscan-test @@ -21,9 +21,9 @@ cat <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 8b9c8758da..068ae10927 100755 --- a/regress/tests/bsr-opt-test +++ b/regress/tests/bsr-opt-test @@ -21,8 +21,8 @@ cat <${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 f38dd97dff..4b9de5438b 100755 --- a/regress/tests/bug-897 +++ b/regress/tests/bug-897 @@ -32,7 +32,7 @@ start_test cat <${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 a0b1f0cf2a..0677657810 100755 --- a/regress/tests/bug-fatal-test +++ b/regress/tests/bug-fatal-test @@ -23,7 +23,7 @@ start_test cat <${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 77e858acab..d4eb0cae52 100755 --- a/regress/tests/compress-encrypt-test +++ b/regress/tests/compress-encrypt-test @@ -17,7 +17,7 @@ cat <${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 229a5b1214..47fc8e4362 100755 --- 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 ca643677d1..8726113f27 100755 --- a/regress/tests/concurrent-jobs-test +++ b/regress/tests/concurrent-jobs-test @@ -34,7 +34,7 @@ cat <${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 f0dfd2f0be..581b8a219c 100755 --- a/regress/tests/data-encrypt-test +++ b/regress/tests/data-encrypt-test @@ -19,7 +19,7 @@ cat <${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 e4c3c32422..f1e95362da 100755 --- a/regress/tests/debug-test +++ b/regress/tests/debug-test @@ -17,7 +17,7 @@ cat <${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 cab86fc0fd..0d005e56b7 100755 --- a/regress/tests/dev-test-root +++ b/regress/tests/dev-test-root @@ -19,7 +19,7 @@ cat <${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 df9b49fd91..4d95637a58 100755 --- a/regress/tests/differential-test +++ b/regress/tests/differential-test @@ -25,8 +25,8 @@ cat <${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 fa0d2393d5..93f2b2ef35 100755 --- a/regress/tests/encrypt-bug-test +++ b/regress/tests/encrypt-bug-test @@ -28,7 +28,7 @@ cat <${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 a3f028823c..5a57c42350 100755 --- a/regress/tests/errors-test +++ b/regress/tests/errors-test @@ -21,7 +21,7 @@ cat <${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 6be6fad540..50a45f2cbf 100755 --- a/regress/tests/etc-test-root +++ b/regress/tests/etc-test-root @@ -16,7 +16,7 @@ cat <${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 5b35b0992d..c0dcd4232f 100755 --- a/regress/tests/fifo-test +++ b/regress/tests/fifo-test @@ -22,7 +22,7 @@ cat <${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 58d38d89b4..6f10087dbc 100755 --- a/regress/tests/four-concurrent-jobs-test +++ b/regress/tests/four-concurrent-jobs-test @@ -20,9 +20,9 @@ cat <${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 eb2a8b666b..b13a3ddd93 100755 --- 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 ce07f16947..f3b560af07 100755 --- a/regress/tests/gigaslam-sparse-test +++ b/regress/tests/gigaslam-sparse-test @@ -25,7 +25,7 @@ cat >${cwd}/tmp/bconcmds <${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 9e2e1b6016..f41a84fe3e 100755 --- a/regress/tests/incremental-test +++ b/regress/tests/incremental-test @@ -25,8 +25,8 @@ cat <${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 5f792c064d..9044d1c088 100755 --- a/regress/tests/lib-tape-root +++ b/regress/tests/lib-tape-root @@ -19,7 +19,7 @@ cat < >${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 739e042acb..54da62c7d4 100755 --- a/regress/tests/lib-test-root +++ b/regress/tests/lib-test-root @@ -19,7 +19,7 @@ cat <${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 c444cdc432..5aa031e848 100755 --- 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 e9e9dba955..a671c0b3d2 100755 --- a/regress/tests/maxvol-test +++ b/regress/tests/maxvol-test @@ -24,10 +24,10 @@ cat <${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 c8f5db0dd7..7fe6c2befe 100755 --- a/regress/tests/maxvol2-test +++ b/regress/tests/maxvol2-test @@ -20,9 +20,9 @@ cat <${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 01c9bdd2e8..fb61105d19 100755 --- 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 8bdfad1de9..a7aa70538e 100755 --- a/regress/tests/plugin-test +++ b/regress/tests/plugin-test @@ -18,7 +18,7 @@ cat <${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 64bf87ce70..a4d365e1fe 100755 --- a/regress/tests/query-test +++ b/regress/tests/query-test @@ -25,8 +25,8 @@ cat <${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 bc822fe41c..701a0083e7 100755 --- a/regress/tests/recycle-test +++ b/regress/tests/recycle-test @@ -25,10 +25,10 @@ cat <${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 8b3d2f4360..5d6ffc4884 100755 --- a/regress/tests/regexwhere-test +++ b/regress/tests/regexwhere-test @@ -30,7 +30,7 @@ start_test cat <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 1beca6012f..04b448d82d 100755 --- a/regress/tests/restore-by-file-test +++ b/regress/tests/restore-by-file-test @@ -27,7 +27,7 @@ cat <${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 ecc31df570..38fc0f7b7b 100755 --- a/regress/tests/restore-disk-seek-test +++ b/regress/tests/restore-disk-seek-test @@ -52,7 +52,7 @@ cat <${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 1e5f00df07..1a4553ab14 100755 --- a/regress/tests/restore2-by-file-test +++ b/regress/tests/restore2-by-file-test @@ -18,7 +18,7 @@ cat <${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 6f2b4d58fe..d687c7d526 100755 --- a/regress/tests/span-vol-test +++ b/regress/tests/span-vol-test @@ -20,10 +20,10 @@ cat <${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 fa25d47cbd..47e05e41c1 100755 --- a/regress/tests/sparse-compressed-test +++ b/regress/tests/sparse-compressed-test @@ -18,7 +18,7 @@ cat >${cwd}/tmp/bconcmds <${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 0c64b34bbe..38d12fd998 100755 --- a/regress/tests/sparse-test +++ b/regress/tests/sparse-test @@ -17,7 +17,7 @@ cat >${cwd}/tmp/bconcmds <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 7493dfb472..8d551aca66 100755 --- a/regress/tests/usr-tape-root +++ b/regress/tests/usr-tape-root @@ -19,7 +19,7 @@ cat < ${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 c1ac0011dc..c51228d8ea 100755 --- a/regress/tests/verify-vol-test +++ b/regress/tests/verify-vol-test @@ -26,7 +26,7 @@ cat <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 28f69d1ad4..1cf26d7baa 100755 --- a/regress/tests/verify-voltocat-test +++ b/regress/tests/verify-voltocat-test @@ -31,7 +31,7 @@ cat <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 9aea202d09..6563a9170f 100755 --- 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 75049b7782..920ca7c60a 100755 --- a/regress/tests/weird-files-test +++ b/regress/tests/weird-files-test @@ -37,7 +37,7 @@ cat <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 7616cc71d9..9a8e1dce3b 100755 --- a/regress/tests/weird-files2-test +++ b/regress/tests/weird-files2-test @@ -31,7 +31,7 @@ cat <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 5718a22c06..9f1568b62c 100755 --- 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 -- 2.39.5