From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 6 Mar 2004 22:15:42 +0000 (+0000)
Subject: Misc
X-Git-Tag: Release-1.34.0~69
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7038c19be74a362fb46b49d8256e07a395c48e62;p=bacula%2Fbacula

Misc


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

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index 5907f322b5..c12d7b3fc2 100644
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -110,9 +110,9 @@ Messages {
   Name = Standard
   mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
   operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
-  MailOnError = @job_email@ = all
+  MailOnError = @job_email@ = all, !terminate
   operator = @job_email@ = mount
-  console = all, !skipped
+  console = all, !skipped, !terminate
 #
 # WARNING! the following will create a file that you must cycle from
 #          time to time as it will grow indefinitely. However, it will
diff --git a/regress/scripts/bacula-sd-2tape.conf.in b/regress/scripts/bacula-sd-2tape.conf.in
index bd917ccfa8..32327cc39b 100644
--- a/regress/scripts/bacula-sd-2tape.conf.in
+++ b/regress/scripts/bacula-sd-2tape.conf.in
@@ -51,5 +51,5 @@ Device {
 #
 Messages {
   Name = Standard
-  director = @hostname@-dir = all
+  director = @hostname@-dir = all, !terminate
 }
diff --git a/regress/scripts/bacula-sd-tape.conf.in b/regress/scripts/bacula-sd-tape.conf.in
index 6019e19b9e..9504a33833 100644
--- a/regress/scripts/bacula-sd-tape.conf.in
+++ b/regress/scripts/bacula-sd-tape.conf.in
@@ -49,5 +49,5 @@ Device {
 #
 Messages {
   Name = Standard
-  director = @hostname@-dir = all
+  director = @hostname@-dir = all, !terminate
 }
diff --git a/regress/scripts/bacula-sd.conf.in b/regress/scripts/bacula-sd.conf.in
index 47422aa660..745f713248 100644
--- a/regress/scripts/bacula-sd.conf.in
+++ b/regress/scripts/bacula-sd.conf.in
@@ -70,5 +70,5 @@ Device {
 #
 Messages {
   Name = Standard
-  director = rufus-dir = all
+  director = rufus-dir = all, !terminate
 }
diff --git a/regress/scripts/test-bacula-fd.conf.in b/regress/scripts/test-bacula-fd.conf.in
index c5554bbfac..1423c69bb8 100644
--- a/regress/scripts/test-bacula-fd.conf.in
+++ b/regress/scripts/test-bacula-fd.conf.in
@@ -29,5 +29,5 @@ FileDaemon {                          # this is me
 # Send all messages except skipped files back to Director
 Messages {
   Name = Standard
-  director = @hostname@-dir = all
+  director = @hostname@-dir = all, !terminate
 }
diff --git a/regress/scripts/test-bacula-sd.conf.in b/regress/scripts/test-bacula-sd.conf.in
index ae4fdc6a7d..9e40f501dc 100644
--- a/regress/scripts/test-bacula-sd.conf.in
+++ b/regress/scripts/test-bacula-sd.conf.in
@@ -103,5 +103,5 @@ Device {
 #
 Messages {
   Name = Standard
-  director = @hostname@-dir = all
+  director = @hostname@-dir = all, !terminate
 }
diff --git a/regress/scripts/testa-bacula-dir.conf.in b/regress/scripts/testa-bacula-dir.conf.in
index 52c1657fd2..13bbfcd53d 100644
--- a/regress/scripts/testa-bacula-dir.conf.in
+++ b/regress/scripts/testa-bacula-dir.conf.in
@@ -110,9 +110,9 @@ Messages {
   Name = Standard
   mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
   operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
-  MailOnError = @job_email@ = all
+  MailOnError = @job_email@ = all, !terminate
   operator = @job_email@ = mount
-  console = all, !skipped
+  console = all, !skipped, !terminate
 
   append = "@working_dir@/log" = all, !skipped
 }
diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index a0f2b03308..abd55c631a 100755
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -19,8 +19,7 @@ echo " === Starting four-concurrent-jobs-test  ==="
 echo " === Starting four-concurrent-jobs-test  ===" >>working/log
 echo " "
 
-#bin/bacula start 2>&1 >/dev/null
-bin/bacula start
+bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test
index 603986b796..8da375d4d5 100755
--- a/regress/tests/restore-disk-seek-test
+++ b/regress/tests/restore-disk-seek-test
@@ -42,12 +42,11 @@ echo " === Starting restore-disk-seek-test ==="
 echo " === Starting restore-disk-seek-test ===" >>working/log
 echo " "
 
-# bin/bacula start -v -v 2>&1 >/dev/null
-bin/bacula start -v -v 
+bin/bacula start -v -v 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@tee /dev/null
+@output /dev/null
 messages
-@tee tmp/log1.out
+@output tmp/log1.out
 label storage=File volume=TestVolume001
 run job=CompressedTest yes
 wait
@@ -55,7 +54,7 @@ messages
 @# 
 @# now do a restore
 @#
-@tee tmp/log2.out
+@output tmp/log2.out
 sql
 select * from JobMedia;
 
@@ -66,7 +65,7 @@ restore where=${cwd}/tmp/bacula-restores storage=File
 yes
 wait
 messages
-@tee
+@output
 quit
 END_OF_DATA
 bin/bacula stop 2>&1 >/dev/null