Exit if zombie jobs or log errors

[bacula/bacula] / regress / scripts / bacula-dir.conf.testrunscript.in

diff --git a/regress/scripts/bacula-dir.conf.testrunscript.in b/regress/scripts/bacula-dir.conf.testrunscript.in
index 9efaf661582527b103f9756406147c6d274f83e6..522a7fde22f34e507f53324f2639a896fc437724 100644 (file)
--- a/regress/scripts/bacula-dir.conf.testrunscript.in
+++ b/regress/scripts/bacula-dir.conf.testrunscript.in
@@ -87,12 +87,49 @@ Job {
   JobDefs = DefaultJob
   RunScript {
     Command = "/bin/false RUN_FD_FAILED1"
-    abortjobonerror = no
+    failjobonerror = no
     RunsWhen = Before
   }
   RunScript {
     Command = "/bin/false RUN_FD_FAILED2"
-    abortjobonerror = yes
+    failjobonerror = yes
+    RunsWhen = Before
+  }
+
+  Run After Failed Job = "/bin/echo RunAfterFailedJob"
+  RunScript {
+    Command = "/bin/echo touching @tmpdir@/RUN_FD_FAILED"
+    RunsWhen = after
+    RunsOnFailure = yes
+  }
+  RunScript {
+    Command = "/bin/touch @tmpdir@/RUN_FD_FAILED"
+    RunsWhen = after
+    RunsOnFailure = yes
+  }
+}
+
+#@hostname@-fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED1"
+#we dont execute FAILED2 
+#@hostname@-dir: AfterJob: run command "/bin/echo RunAfterFailedJob"
+Job {
+  Name = "RUN_FD_FAILED2"
+  FileSet = FS_TESTJOB  
+  JobDefs = DefaultJob
+  RunScript {
+    Command = "/bin/false RUN_FD_FAILED1"
+    failjobonerror = yes
+    RunsWhen = Before
+  }
+  RunScript {
+    Command = "/bin/false RUN_FD_FAILED2"
+    failjobonerror = yes
+    RunsWhen = Before
+  }
+  RunScript {
+    Command = "/bin/false RUN_FD_FAILED3"
+    failjobonerror = yes
+    RunsOnFailure = yes
     RunsWhen = Before
   }
 
@@ -107,12 +144,37 @@ Job {
   JobDefs = DefaultJob
   RunScript {
     Command = "/bin/false RUN_FD_WARNING"
-    abortjobonerror = no
+    failjobonerror = no
     RunsWhen = Before
   }
   Run After Failed Job = "/bin/echo RunAfterFailedJob"
 }
 
+FileSet {
+ Name = FS_FIFO
+ Include {
+   Options { readfifo = yes }
+   File=</tmp/file-list
+ }
+}
+
+Job {
+  Name = BUG_897
+  JobDefs = DefaultJob
+  FileSet = FS_FIFO
+
+  RunScript {
+    Command = "/bin/echo touching /tmp/RUN_BUG_897"
+    RunsWhen = after
+    RunsOnFailure = yes
+  }
+  RunScript {
+    Command = "/bin/touch /tmp/RUN_BUG_897"
+    RunsWhen = after
+    RunsOnFailure = yes
+  }
+}
+
 # Client (File Services) to backup
 Client {
   Name = @hostname@-fd
@@ -140,13 +202,13 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
-  dbname = bacula; user = bacula; password = ""
+  dbname = regress; user = regress; password = ""
 }
 
 
 Messages {
   Name = Standard
-  stdout = all, !skipped
+  console = all, !skipped, !saved
 }
 
 # Default pool definition