ebl update

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

diff --git a/regress/scripts/bacula-dir.conf.testrunscript.in b/regress/scripts/bacula-dir.conf.testrunscript.in
index c93a4ce7a78c870a94759e18b4a95f333e1ba991..9efaf661582527b103f9756406147c6d274f83e6 100644 (file)
--- a/regress/scripts/bacula-dir.conf.testrunscript.in
+++ b/regress/scripts/bacula-dir.conf.testrunscript.in
@@ -21,7 +21,7 @@ Director {                            # define myself
   SubSysDirectory = "@subsysdir@"
   Maximum Concurrent Jobs = 4
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"         # Console password
-  Messages = Daemon
+  Messages = Standard
 }
 
 JobDefs {
@@ -146,40 +146,7 @@ Catalog {
 
 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
-  operator = @job_email@ = mount
-  console = all, !skipped, !terminate, !restored
-#
-# WARNING! the following will create a file that you must cycle from
-#          time to time as it will grow indefinitely. However, it will
-#          also keep all your messages if the scroll off the console.
-#
-  append = "@working_dir@/log" = all, !skipped
-}
-
-Messages {
-  Name = NoEmail
-  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  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
-#          also keep all your messages if the scroll off the console.
-#
-  append = "@working_dir@/log" = all, !skipped
-}
-
-
-# Message delivery for daemon messages (no job).
-Messages {
-  Name = Daemon
-  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
-  mail = @job_email@ = all, !skipped
-  console = all, !skipped, !saved
-  append = "@working_dir@/log" = all, !skipped
+  stdout = all, !skipped
 }
 
 # Default pool definition

diff --git a/regress/tests/runscript-test b/regress/tests/runscript-test
index 6deb7e266aa800938fb50b7a8c08495b3017985e..77212621fc5bfd73bda94cf6ddd40f74c09ac687 100755 (executable)
--- a/regress/tests/runscript-test
+++ b/regress/tests/runscript-test
@@ -21,12 +21,12 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 label volume=TestVolume001
 @#setdebug level=100 storage=File
-@output tmp/log.RUN1.out
-run job=RUN_ALL_OK yes
+@output tmp/log.RUN2.out
+run job=RUN_FD_WARNING yes
 wait
 @sleep 5
 messages
-run job=RUN_FD_WARNING yes
+run job=RUN_ALL_OK yes
 wait
 @sleep 5
 messages
@@ -42,7 +42,10 @@ st dir
 quit
 END_OF_DATA
 
-run_bacula
+
+bin/bacula start
+cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf &> tmp/log.RUN1.out
+
 stop_bacula
 
 if grep -q 'dir: BeforeJob: run command "/bin/echo RunBeforeJob"'          tmp/log.RUN1.out   &&