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 5907f322b51c0d774f9f8dc5d4d38293837b1b67..c12d7b3fc2e4eb53124906d4b9a0dcc441db5c1b 100644 (file)
--- 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 bd917ccfa80326d4a3feaaa95ef181c04629ff78..32327cc39b3a6ea67bb8a17b9657eabfe63efbf7 100644 (file)
--- 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 6019e19b9e391edac54ed9b24f032a9e0807ffea..9504a33833eac229a1501f8e34eb878d39cce801 100644 (file)
--- 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 47422aa6605b3f03e493bf39df53f65eccf16f6d..745f713248dbce9064c0f81d03c82edfa106e302 100644 (file)
--- 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 c5554bbfac98ee3d721196babdd5b36edbd50677..1423c69bb8b9d4fbe1c939d240569e4d2141dfd9 100644 (file)
--- 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 ae4fdc6a7d078a7a2da9de98698c04434e3f726b..9e40f501dc0686668b7b8e286d2863c290709925 100644 (file)
--- 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 52c1657fd2bbc7ebddd7d43b55bd79e1e5a438fb..13bbfcd53def5e85d6b33c8dc2a2090ec1f2ca63 100644 (file)
--- 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 a0f2b0330862fe852a4cd312ac2eb7ae52bf353a..abd55c631ac529e19539399a1e38086cc9273172 100755 (executable)
--- 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 603986b79697b737b7eac022674f5b4a5d83bc16..8da375d4d5df589cc997b34a795702e7671e7681 100755 (executable)
--- 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