Updates

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

diff --git a/regress/all-non-root-tape-tests b/regress/all-non-root-tape-tests
index 5a64aad4c378a11a49ca58d3c538a5357753ea32..8b2527670d2e8433a98ad6bcccd935b39f34be89 100755 (executable)
--- a/regress/all-non-root-tape-tests
+++ b/regress/all-non-root-tape-tests
@@ -15,6 +15,7 @@ tests/relabel-tape
 tests/restore-by-file-tape
 tests/small-file-size-tape
 tests/truncate-bug-tape
+tests/two-pool-tape
 echo " "
 echo " "
 echo "Test results"

diff --git a/regress/scripts/copy-2drive-confs b/regress/scripts/copy-2drive-confs
index 1f5c3475a2f09125c7a4d629133c0df8447815fe..0388c4c1752c7a0ce5450f0c47ac8bf3403b3c0c 100755 (executable)
--- a/regress/scripts/copy-2drive-confs
+++ b/regress/scripts/copy-2drive-confs
@@ -7,3 +7,9 @@ outf="tmp/sed_tmp"
 echo "s%# Autochanger = yes%  Autochanger = yes%g" >${outf}
 cp bin/bacula-dir.conf tmp/1
 sed -f ${outf} tmp/1 >bin/bacula-dir.conf
+
+# get proper SD tape definitions
+cp -f scripts/linux_tape_options bin/tape_options
+if test x`uname` = xFreeBSD ; then
+   cp -f scripts/freebsd_tape_options bin/tape_options
+fi

diff --git a/regress/scripts/copy-2tape-confs b/regress/scripts/copy-2tape-confs
index 587e5ff1d32ef1c8ee97c5a8a1d6094a1f0b6016..e23adc5c820a52872972cdc1956fa99d344f1e49 100755 (executable)
--- a/regress/scripts/copy-2tape-confs
+++ b/regress/scripts/copy-2tape-confs
@@ -7,3 +7,9 @@ outf="tmp/sed_tmp"
 echo "s%# Autochanger = yes%  Autochanger = yes%g" >${outf}
 cp bin/bacula-dir.conf tmp/1
 sed -f ${outf} tmp/1 >bin/bacula-dir.conf
+
+# get proper SD tape definitions
+cp -f scripts/linux_tape_options bin/tape_options
+if test x`uname` = xFreeBSD ; then
+   cp -f scripts/freebsd_tape_options bin/tape_options
+fi

diff --git a/regress/scripts/copy-confs b/regress/scripts/copy-confs
index d1e6cc1c36f6dfbfbd8a3f7898971d4af38cdf43..c12a20a359a81e0f5de970745b87d6bcb46d1376 100755 (executable)
--- a/regress/scripts/copy-confs
+++ b/regress/scripts/copy-confs
@@ -3,3 +3,9 @@
 /bin/cp -f scripts/bacula-sd.conf bin/bacula-sd.conf
 /bin/cp -f scripts/bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/bconsole.conf bin/bconsole.conf
+
+# get proper SD tape definitions
+cp -f scripts/linux_tape_options bin/tape_options
+if test x`uname` = xFreeBSD ; then
+   cp -f scripts/freebsd_tape_options bin/tape_options
+fi

diff --git a/regress/scripts/copy-tape-confs b/regress/scripts/copy-tape-confs
index 588dddc35b1b2c7eb5a9ad85d926f05bfc4f9023..c8dae32c4a8b27c4c394b112a71bc4ba47d14656 100755 (executable)
--- a/regress/scripts/copy-tape-confs
+++ b/regress/scripts/copy-tape-confs
@@ -3,3 +3,9 @@
 /bin/cp -f scripts/bacula-sd-tape.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+
+# get proper SD tape definitions
+cp -f scripts/linux_tape_options bin/tape_options
+if test x`uname` = xFreeBSD ; then
+   cp -f scripts/freebsd_tape_options bin/tape_options
+fi

diff --git a/regress/scripts/copy-test-confs b/regress/scripts/copy-test-confs
index 61b120f61035d606f8f7563cc2ece09558da5f12..5552c77116fc09889ff5067b8be6b6864a908fb1 100755 (executable)
--- a/regress/scripts/copy-test-confs
+++ b/regress/scripts/copy-test-confs
@@ -3,3 +3,9 @@
 /bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+
+# get proper SD tape definitions
+cp -f scripts/linux_tape_options bin/tape_options
+if test x`uname` = xFreeBSD ; then
+   cp -f scripts/freebsd_tape_options bin/tape_options
+fi

diff --git a/regress/scripts/copy-testa-confs b/regress/scripts/copy-testa-confs
index 6b5f30c3ef0138ca6ecd97e327788c3b185dbdc7..46116b9f900a9647234c9da082e2f8301dab0f40 100755 (executable)
--- a/regress/scripts/copy-testa-confs
+++ b/regress/scripts/copy-testa-confs
@@ -3,3 +3,9 @@
 /bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+
+# get proper SD tape definitions
+cp -f scripts/linux_tape_options bin/tape_options
+if test x`uname` = xFreeBSD ; then
+   cp -f scripts/freebsd_tape_options bin/tape_options
+fi

diff --git a/regress/scripts/copy-win32-confs b/regress/scripts/copy-win32-confs
index fa698a3ceb022aff1d56e029ca5f94c9392a439f..7cda59aabcf0773095faaa29637171c337470763 100755 (executable)
--- a/regress/scripts/copy-win32-confs
+++ b/regress/scripts/copy-win32-confs
@@ -3,3 +3,9 @@
 /bin/cp -f scripts/win32-bacula-sd-tape.conf bin/bacula-sd.conf
 /bin/cp -f scripts/win32-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+
+# get proper SD tape definitions
+cp -f scripts/linux_tape_options bin/tape_options
+if test x`uname` = xFreeBSD ; then
+   cp -f scripts/freebsd_tape_options bin/tape_options
+fi

diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed
index 61614122f26d9a0f719fbcc405ac7f7c187ba2cd..d12990b2d1914b398bfd364c90f8ec0f052665e4 100755 (executable)
--- a/regress/scripts/do_sed
+++ b/regress/scripts/do_sed
@@ -9,6 +9,7 @@ if test $# != 6 ; then
    echo "  and the sixth must be the smtp or email host"
    exit 1
 fi
+mkdir -p ${cwd}/bin
 out="/tmp/sed_tmp"
 cwd=`pwd`
 HOST="localhost"
@@ -43,6 +44,7 @@ sed -f ${out} ${cwd}/scripts/cleanup-tape.in >${cwd}/scripts/cleanup-tape
 sed -f ${out} ${cwd}/scripts/cleanup-2tape.in >${cwd}/scripts/cleanup-2tape
 sed -f ${out} ${cwd}/scripts/cleanup-2drive.in >${cwd}/scripts/cleanup-2drive
 sed -f ${out} ${cwd}/scripts/prepare-two-tapes.in >${cwd}/scripts/prepare-two-tapes
+
 cp ${cwd}/bin/bacula-sd.conf /tmp/bac$$
 sed s%/tmp%${cwd}/tmp%g /tmp/bac$$ >${cwd}/bin/bacula-sd.conf
 chmod 777 ${cwd}/scripts/cleanup-*tape ${cwd}/scripts/cleanup-*drive ${cwd}/scripts/prepare-two-tapes

diff --git a/regress/tests/two-pool-tape b/regress/tests/two-pool-tape
index 38c59e6ea5defa843aa499add93996d2cd92b2e8..3a1cd795a2f0181d4ec5de21c9bb979833a3c2bc 100755 (executable)
--- a/regress/tests/two-pool-tape
+++ b/regress/tests/two-pool-tape
@@ -7,7 +7,7 @@
 #  is in /tmp/file-list, which is by default the Bacula
 #  source code (i.e. the build directory).
 #
-debug=1
+debug=0
 if test "$debug" -eq 1 ; then
   out="tee"
 else
@@ -18,57 +18,12 @@ scripts/cleanup
 scripts/copy-2tape-confs
 scripts/prepare-two-tapes
  
-# Make a relatively large backup set 50 x source code directory
+# Make a relatively large backup set 5 x source code directory
 echo "${cwd}/build" >/tmp/file-list
 echo "${cwd}/build" >>/tmp/file-list
 echo "${cwd}/build" >>/tmp/file-list
 echo "${cwd}/build" >>/tmp/file-list
 echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
-echo "${cwd}/build" >>/tmp/file-list
 
 echo " "
 echo " "
@@ -77,7 +32,7 @@ echo " === Starting Two Pool Tape test at `date +%R:%S` ===" >>working/log
 echo " "
 # Write out bconsole commands to a file
 cat <<END_OF_DATA >tmp/bconcmds
-@$out /dev/null
+@output /dev/null
 messages
 @$out tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=1 pool=Full drive=0
@@ -85,10 +40,14 @@ label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0
 list volumes
 @# Start job with Client run before and sleep
 run job=NightlySave1 level=Full pool=Default yes
+run job=NightlySave1 level=Full pool=Default yes
+run job=NightlySave1 level=Full pool=Default yes
 @# wait between starting jobs
 @sleep 60
 @#setdebug level=100 storage=DDS-4
 run job=NightlySave2 level=Full pool=Full yes
+run job=NightlySave2 level=Full pool=Full yes
+run job=NightlySave2 level=Full pool=Full yes
 @sleep 10
 messages
 @sleep 10