From 2587b290953be60db0af8aa40730da5b900fa929 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 31 Mar 2008 12:31:43 +0000 Subject: [PATCH] Update git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6707 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/tests/ansi-label-tape | 2 +- regress/tests/backup-bacula-tape | 2 +- regress/tests/bscan-tape | 2 +- regress/tests/fixed-block-size-tape | 2 +- regress/tests/four-concurrent-jobs-tape | 7 ++++++- regress/tests/four-concurrent-jobs-test | 8 ++++++-- regress/tests/four-jobs-tape | 2 +- regress/tests/incremental-tape | 2 +- regress/tests/restore-by-file-tape | 2 +- regress/tests/small-file-size-tape | 2 +- regress/tests/truncate-bug-tape | 2 +- regress/tests/verify-vol-tape | 2 +- 12 files changed, 22 insertions(+), 13 deletions(-) diff --git a/regress/tests/ansi-label-tape b/regress/tests/ansi-label-tape index 141316a6bc..4bd763bf87 100755 --- a/regress/tests/ansi-label-tape +++ b/regress/tests/ansi-label-tape @@ -8,7 +8,7 @@ # We also use the purge and the relabel commands as # well as a pile of status storage commands. # -TestName="ansi-label-1t1d-tape" +TestName="ansi-label-tape" JobName=backuptape . scripts/functions diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape index 4a80a8f201..2e0fb1cbc7 100755 --- a/regress/tests/backup-bacula-tape +++ b/regress/tests/backup-bacula-tape @@ -6,7 +6,7 @@ # We also use the purge and the relabel commands as # well as a pile of status storage commands. # -TestName="backup-bacula-1t1d-tape" +TestName="backup-bacula-tape" JobName=backuptape . scripts/functions diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape index e6a070d8bf..71341697e4 100755 --- a/regress/tests/bscan-tape +++ b/regress/tests/bscan-tape @@ -5,7 +5,7 @@ # do a bscan and restore. # It should require at least 4 different bsrs. # -TestName="bscan-1t1d-tape" +TestName="bscan-tape" JobName=bscantape . scripts/functions diff --git a/regress/tests/fixed-block-size-tape b/regress/tests/fixed-block-size-tape index e34c3f5305..7ba4d453b8 100755 --- a/regress/tests/fixed-block-size-tape +++ b/regress/tests/fixed-block-size-tape @@ -4,7 +4,7 @@ # to a tape where we set the minimum and maximum block # sizes. # -TestName="fixed-block-size-1t1d-tape" +TestName="fixed-block-size-tape" JobName=fixedblocksize . scripts/functions diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape index b4fcc2a8e1..8fc617f24c 100755 --- a/regress/tests/four-concurrent-jobs-tape +++ b/regress/tests/four-concurrent-jobs-tape @@ -2,7 +2,7 @@ # # Run four jobs at the same time # -TestName="four-concurrent-jobs-1t1d-tape" +TestName="four-concurrent-jobs-tape" JobName=FourConcurrentJobs . scripts/functions @@ -33,6 +33,11 @@ status storage=DDS-4 messages wait messages +@$out ${cwd}/tmp/jobmedia.out +list volumes +sql +select JobId,MediaId,StartFile,StartBlock,EndFile,EndBlock from JobMedia; + @# @# now do a restore @# diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test index d1b047030d..aff0e47897 100755 --- a/regress/tests/four-concurrent-jobs-test +++ b/regress/tests/four-concurrent-jobs-test @@ -71,7 +71,6 @@ reload @sleep 5 messages reload -reload wait status storage=File1 reload @@ -81,6 +80,12 @@ messages @# @# now do a restore @# +@$out ${cwd}/tmp/jobmedia.out +list volumes +sql +select JobId,MediaId,StartFile,StartBlock,EndFile,EndBlock from JobMedia; + + @$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=File1 unmark * @@ -90,7 +95,6 @@ yes run job=$JobName level=Full Storage=File1 yes wait reload -reload messages @output quit diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape index 3a850186a1..ff579c09a0 100755 --- a/regress/tests/four-jobs-tape +++ b/regress/tests/four-jobs-tape @@ -4,7 +4,7 @@ # then backup four times, each with incremental then finally restore. # It should require at least 4 different bsrs. # -TestName="four-jobs-1t1d-tape" +TestName="four-jobs-tape" JobName=fourjobstape . scripts/functions diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape index 2e83c7a45d..38e8347b68 100755 --- a/regress/tests/incremental-tape +++ b/regress/tests/incremental-tape @@ -3,7 +3,7 @@ # Run a simple backup of the Bacula build directory then create some # new files, do an Incremental and restore those two files. # -TestName="incremental-1t1d-tape" +TestName="incremental-tape" JobName=IncTape . scripts/functions diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape index e88f5d87c8..fefc274ac8 100755 --- a/regress/tests/restore-by-file-tape +++ b/regress/tests/restore-by-file-tape @@ -6,7 +6,7 @@ # file size to 1M, it runs very slow. There are about 64 files that # are created during each of the two backups. # -TestName="restore-by-file-1t1d-tape" +TestName="restore-by-file-tape" JobName=restorebyfile . scripts/functions diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape index a677de6541..7000b0de9f 100755 --- a/regress/tests/small-file-size-tape +++ b/regress/tests/small-file-size-tape @@ -3,7 +3,7 @@ # Run a simple backup of the Bacula build directory # to a tape where the maximum tape file size is set to 1M # -TestName="small-file-size-1t1d-tape" +TestName="small-file-size-tape" JobName=smallfilesize . scripts/functions diff --git a/regress/tests/truncate-bug-tape b/regress/tests/truncate-bug-tape index 97a58fa96d..b1c9fc6c85 100755 --- a/regress/tests/truncate-bug-tape +++ b/regress/tests/truncate-bug-tape @@ -2,7 +2,7 @@ # # Test for a tape truncation bug. # -TestName="truncate-bug-1t1d-tape" +TestName="truncate-bug-tape" JobName=truncatebug . scripts/functions diff --git a/regress/tests/verify-vol-tape b/regress/tests/verify-vol-tape index 40065ad2ec..b1e79b98c7 100755 --- a/regress/tests/verify-vol-tape +++ b/regress/tests/verify-vol-tape @@ -3,7 +3,7 @@ # Run a simple backup of the Bacula build directory # then verify the catalog. # -TestName="verify-vol-1t1d-tape" +TestName="verify-vol-tape" JobName=VerifyVol . scripts/functions -- 2.39.5