Updates

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

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index 865d7bf398fa674f9f0bba29ac20fd6a1ca9c902..c7fa058ae8d0dfa0a360566594de5bc617c92888 100644 (file)
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -142,3 +142,22 @@ Pool {
   Volume Retention = 365d             # one year
   Accept Any Volume = yes             # write on any volume in the pool
 }
+
+Pool {
+  Name = Full
+  Pool Type = Backup
+  Recycle = yes                       # Bacula can automatically recycle Volumes
+  AutoPrune = yes                     # Prune expired volumes
+  Volume Retention = 365d             # one year
+  Accept Any Volume = yes             # write on any volume in the pool
+}
+
+Pool {
+  Name = Inc
+  Pool Type = Backup
+  Recycle = yes                       # Bacula can automatically recycle Volumes
+  AutoPrune = yes                     # Prune expired volumes
+  Volume Retention = 365d             # one year
+  Accept Any Volume = yes             # write on any volume in the pool
+}
+

diff --git a/regress/scripts/bacula-sd-2tape.conf.in b/regress/scripts/bacula-sd-2tape.conf.in
index 0bfc6326c2bc9b186bb60a2ee43a2f27118cfa95..63e541b91c964cb827af51d9b8a9b08cc6d502f4 100644 (file)
--- a/regress/scripts/bacula-sd-2tape.conf.in
+++ b/regress/scripts/bacula-sd-2tape.conf.in
@@ -31,14 +31,20 @@ Director {
 # To connect, the Director's bacula-dir.conf must have the
 #  same Name and MediaType. 
 #
+Autochanger {
+  Name = DDS-4
+  Changer Device = @autochanger@
+  Changer Command ="@scriptdir@/mtx-changer %c %o %S %a"
+  Device = DDS-4-1
+}
 
 Device {
-  Name = DDS-4                     # 
+  Name = DDS-4-1                   # 
   Media Type = DDS-4
-  Changer Device = @autochanger@
-  Changer Command ="@scriptdir@/mtx-changer %c %o %S %a"
   Archive Device = @tape_drive@
   AutomaticMount = yes;               # when device opened, read it
+  Autochanger = yes
+  Drive Index = 0
   AlwaysOpen = yes;
   RemovableMedia = yes;
   @@sbindir@/tape_options

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index bc458251bdd02bb558fb52cdc056ce8c2076af4c..1db3c0b157b7ef38d2b5f544470cbc35758c1d40 100755 (executable)
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -18,6 +18,7 @@ echo " "
 
 bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
+#bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -47,15 +48,17 @@ scripts/check_for_zombie_jobs storage=File1
 bin/bacula stop 2>&1 >/dev/null
 echo "volume=TestVolume001|TestVolume002" >tmp/bscan.bsr
 bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >/dev/null
+#bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp
 bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
+#bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log2.out
 @# 
 @# now do a restore
 @#
-restore where=${cwd}/tmp/bacula-restores select all storage=File1 done
+restore bootstrap=${cwd}/tmp/kern.bsr where=${cwd}/tmp/bacula-restores select all storage=File1 done
 yes
 wait
 messages

diff --git a/regress/tests/incremental-2tape b/regress/tests/incremental-2tape
index 695a033ee0373d37151e6c00818bffd520b24c49..8dd41ea755b44ff1cdcf6e150c9ea24f97220472 100755 (executable)
Binary files a/regress/tests/incremental-2tape and b/regress/tests/incremental-2tape differ

diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test
index 3e7f171e83c29b5fecc8d280ec9e88ddc933c237..fda085da7f86d5dd0fb698c2e826ca8033ed17e1 100755 (executable)
--- a/regress/tests/restore-disk-seek-test
+++ b/regress/tests/restore-disk-seek-test
@@ -37,7 +37,9 @@ echo " === Starting restore-disk-seek-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start -v -v 2>&1 >/dev/null
+#bin/bacula start -v -v 
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
+#bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -52,7 +54,7 @@ messages
 sql
 select * from JobMedia;
 
-restore where=${cwd}/tmp/bacula-restores storage=File
+restore bootstrap=${cwd}/tmp/kern.bsr where=${cwd}/tmp/bacula-restores storage=File
 7
 <${cwd}/tmp/restore-list