From 1cd051b1fe76949e941a410141f12fbe34333c68 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 15 Oct 2003 12:37:14 +0000 Subject: [PATCH] Make FreeBSD config correctly for tapes git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@749 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/all-tape-and-file-tests | 28 ++-------------------------- regress/scripts/do_sed | 8 ++++++++ regress/tests/backup-bacula-tape | 2 +- regress/tests/backup-bacula-test | 2 +- regress/tests/bextract-test | 2 +- regress/tests/bscan-test | 2 +- regress/tests/bsr-opt-test | 2 +- regress/tests/compressed-test | 4 +--- regress/tests/concurrent-jobs-test | 4 +--- regress/tests/dev-test-root | 2 +- regress/tests/etc-test-root | 2 +- regress/tests/four-jobs-test | 6 +++--- regress/tests/lib-test-root | 2 +- regress/tests/recycle-test | 2 +- regress/tests/restore-by-file-test | 2 +- regress/tests/six-vol-test | 4 +--- regress/tests/small-file-size-tape | 2 +- regress/tests/span-vol-test | 2 +- regress/tests/sparse-compressed-test | 2 +- regress/tests/sparse-test | 2 +- regress/tests/two-jobs-test | 6 +++--- regress/tests/two-vol-test | 2 +- regress/tests/two-volume-tape | 2 +- regress/tests/weird-files-test | 2 +- 24 files changed, 36 insertions(+), 58 deletions(-) diff --git a/regress/all-tape-and-file-tests b/regress/all-tape-and-file-tests index 857934410a..9bc3e7676c 100755 --- a/regress/all-tape-and-file-tests +++ b/regress/all-tape-and-file-tests @@ -2,29 +2,5 @@ # # Run all tests # -tests/test0 -tests/backup-bacula-test -tests/verify-vol-test -tests/sparse-test -tests/compressed-test -tests/sparse-compressed-test -tests/weird-files-test -tests/two-jobs-test -tests/two-vol-test -tests/six-vol-test -tests/bscan-test -tests/weird-files2-test -tests/concurrent-jobs-test -tests/four-concurrent-jobs-test -tests/bsr-opt-test -tests/bextract-test -tests/recycle-test -tests/span-vol-test -tests/backup-bacula-tape -tests/small-file-size-tape -tests/two-volume-tape -echo " " -echo " " -echo "Test results" -cat test.out -scripts/cleanup +./all-non-root-tests +./all-non-root-tape-tests diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed index 097da5471f..0a119f43ef 100755 --- a/regress/scripts/do_sed +++ b/regress/scripts/do_sed @@ -44,5 +44,13 @@ cp ${cwd}/bin/mtx-changer /tmp/bac$$ sed "s%^MTX.*$%MTX=${4}%g" /tmp/bac$$ >${cwd}/bin/mtx-changer chmod 777 ${cwd}/bin/mtx-changer +# get proper SD tape definitions +if test x`uname` = xLinux ; then \ + cp -f scripts/linux_tape_options bin/tape_options ; \ +fi +if test x`uname` = xFreeBsd ; then \ + cp -f scripts/freebsd_tape_options bin/tape_options ; \ +fi + rm -f ${out} rm -f /tmp/bac$$ diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape index 8f669b8164..a96910989c 100755 --- a/regress/tests/backup-bacula-tape +++ b/regress/tests/backup-bacula-tape @@ -30,7 +30,7 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores current all +restore where=${cwd}/tmp/bacula-restores select all yes wait messages diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test index dfda3bcccd..b902521f3a 100755 --- a/regress/tests/backup-bacula-test +++ b/regress/tests/backup-bacula-test @@ -29,7 +29,7 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores current all +restore where=${cwd}/tmp/bacula-restores select all yes wait messages diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test index fc1310b6a4..d8c097efcc 100755 --- a/regress/tests/bextract-test +++ b/regress/tests/bextract-test @@ -33,7 +33,7 @@ messages @# now build the bsr file @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores current all +restore where=${cwd}/tmp/bacula-restores select all no wait messages diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test index aca7d1a773..596850d714 100755 --- a/regress/tests/bscan-test +++ b/regress/tests/bscan-test @@ -57,7 +57,7 @@ messages @# @# now do a restore @# -restore where=${cwd}/tmp/bacula-restores current all +restore where=${cwd}/tmp/bacula-restores select all yes wait messages diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test index 381166ff93..51b761d97f 100755 --- a/regress/tests/bsr-opt-test +++ b/regress/tests/bsr-opt-test @@ -35,7 +35,7 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores current +restore where=${cwd}/tmp/bacula-restores select unmark * cd ${cwd}/build/src/cats mark * diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test index ac886b06e4..c766d44396 100755 --- a/regress/tests/compressed-test +++ b/regress/tests/compressed-test @@ -32,9 +32,7 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores -5 -done +restore where=${cwd}/tmp/bacula-restores select all yes wait messages diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test index e02470e004..67df7d12ae 100755 --- a/regress/tests/concurrent-jobs-test +++ b/regress/tests/concurrent-jobs-test @@ -48,9 +48,7 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores -5 -done +restore where=${cwd}/tmp/bacula-restores select all yes wait messages diff --git a/regress/tests/dev-test-root b/regress/tests/dev-test-root index 194748ce18..0406c85633 100755 --- a/regress/tests/dev-test-root +++ b/regress/tests/dev-test-root @@ -39,7 +39,7 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores current all +restore where=${cwd}/tmp/bacula-restores select all yes wait messages diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root index 3181eba100..592b601371 100755 --- a/regress/tests/etc-test-root +++ b/regress/tests/etc-test-root @@ -39,7 +39,7 @@ messages @# now do a restore @# @output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores current all +restore where=${cwd}/tmp/bacula-restores select all yes wait messages diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test index 8a1ae5bcc9..a4397cb126 100755 --- a/regress/tests/four-jobs-test +++ b/regress/tests/four-jobs-test @@ -88,14 +88,14 @@ echo "Backup 4 done" # bin/console -c bin/console.conf <