Make FreeBSD config correctly for tapes

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

diff --git a/regress/all-tape-and-file-tests b/regress/all-tape-and-file-tests
index 857934410abbe3b519ef9c8a04632115432005de..9bc3e7676c77210026dae379c0ad5a8ade274510 100755 (executable)
--- 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 097da5471f1f697dd7fccf3b0922da45096d7645..0a119f43ef9a232ec9c1ea8ef9de5507861dcee7 100755 (executable)
--- 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 8f669b8164dd1c0c027fc43a6aaa1eb020cd2f20..a96910989ce79a80e682c6854e22fffc97c0e196 100755 (executable)
--- 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 dfda3bcccdcb5cde9bde341243c8f30bf51f983f..b902521f3aa4769c158339b5bad24b1e999d8b09 100755 (executable)
--- 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 fc1310b6a404e300fe78822c7d7d17a2baed595d..d8c097efcc9d97054b8f7dc61ed4b02df4fa1258 100755 (executable)
--- 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 aca7d1a77332efa998bc325a577efca1eb8d5fda..596850d7140c21cb05d1bdc26faba8f997fb75dd 100755 (executable)
--- 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 381166ff93747bf59801f72246bb9131d6f69016..51b761d97fe423c561bae266ff9c2db6cab0071f 100755 (executable)
--- 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 ac886b06e4a9fda2403520c857eb3007643cf4f6..c766d44396c1946afb018fc5b00d9a2d41df74d2 100755 (executable)
--- 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 e02470e0046a816b3a615992498a1677e75831c5..67df7d12ae84cc695a7f9498bd63540b09d0b914 100755 (executable)
--- 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 194748ce18b04f22648b1f5861a402cb316a7e5b..0406c85633d58950c371fe4a79ed7fc3b15d4fba 100755 (executable)
--- 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 3181eba100ca12567670fc2c104e6736797a33e2..592b60137171797659048f5f3dbf9b2b02b3f5f6 100755 (executable)
--- 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 8a1ae5bcc9d0d72974a133b410bd00dbde6dafb8..a4397cb1265c76f0ad8f37deeb9a681bdab5befe 100755 (executable)
--- 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 <<END_OF_DATA
 @output /dev/null
-restore where=${cwd}/tmp/bacula-restores current all
+restore where=${cwd}/tmp/bacula-restores select all
 yes
 wait
-restore where=${cwd}/tmp/bacula-restores current all
+restore where=${cwd}/tmp/bacula-restores select all
 yes
 wait
 @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/lib-test-root b/regress/tests/lib-test-root
index b44dd3c67d779b18c21526a633229345c976e196..0f9821dc0f6b1c3d59eef9d5d7a4697c4a9877de 100755 (executable)
--- a/regress/tests/lib-test-root
+++ b/regress/tests/lib-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/recycle-test b/regress/tests/recycle-test
index 0745b88e23cb1322de7e02c3b6815cf71d3c63ac..91ddeb7d3871197fcd6d562c67f459df7d54371e 100755 (executable)
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -63,7 +63,7 @@ list volumes
 @# 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/restore-by-file-test b/regress/tests/restore-by-file-test
index 22d4cc759bf52bad7ea3f8f5f465835cd77af344..ea7d67998d7d0ed35fd91d791c0d373e176cc02f 100755 (executable)
--- a/regress/tests/restore-by-file-test
+++ b/regress/tests/restore-by-file-test
@@ -38,7 +38,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores
+restore where=${cwd}/tmp/bacula-restores 
 7
 <${cwd}/tmp/restore-list
 

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index 73ce4e920d7ebc6ad85709280e91309fa294a3ee..e828c975b4991907ac5a20bcbbc931cde6f4f5d3 100755 (executable)
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -38,9 +38,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/small-file-size-tape b/regress/tests/small-file-size-tape
index 9d16fef59bd33dd09e06bb6438a1e05384b16409..9ac881b0026341f529fb2ad12e49fd4e52893197 100755 (executable)
--- a/regress/tests/small-file-size-tape
+++ b/regress/tests/small-file-size-tape
@@ -32,7 +32,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/span-vol-test b/regress/tests/span-vol-test
index a73dbfba0d7685693ccbc2642d5503d0b292c24b..8117587c9f5796d32d4a9b0cee506bc124ac8c4c 100755 (executable)
--- a/regress/tests/span-vol-test
+++ b/regress/tests/span-vol-test
@@ -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/sparse-compressed-test b/regress/tests/sparse-compressed-test
index 3f2fcb93411f6720a2614f4681e66b1b794ee65e..984f09223e89439f2e795adf822ddbcfe744e913 100755 (executable)
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -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/sparse-test b/regress/tests/sparse-test
index aaecc63342a940c81e43abec6341f2ceeb947c73..c0ee82741ab41f0b13acf9ab8f476b1e360c75ae 100755 (executable)
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -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/two-jobs-test b/regress/tests/two-jobs-test
index d848ce423f27cce847d028a8589a425e2da0aac3..0b2c250a59e667aab9b595b57203c2b656acecc9 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -48,14 +48,14 @@ messages
 @# now do several restores to ensure we cleanup between jobs
 @#
 @output /dev/null
-restore where=${cwd}/tmp/bacula-restores current all
+restore where=${cwd}/tmp/bacula-restores select all
 yes
 wait
-restore where=${cwd}/tmp/bacula-restores current all
+restore where=${cwd}/tmp/bacula-restores select all
 yes
 wait
 @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/two-vol-test b/regress/tests/two-vol-test
index 53ca3cf8f8e9404663254ea55da797a853bfe90f..814a4e5f8d2344535dc8512482eeebf03f373016 100755 (executable)
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -35,7 +35,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/two-volume-tape b/regress/tests/two-volume-tape
index 95047bee0851461b2fb74a97bfd1ffe5a8b26679..f9717424377c96f29619937e36714d38a53bd200 100755 (executable)
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -36,7 +36,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/weird-files-test b/regress/tests/weird-files-test
index 7237d40c3faca76c01f19fb9d103e250099947fd..4e81c0a3973bad874eb3700b0a57af02e4aa69db 100755 (executable)
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -37,7 +37,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