Tweak up build concurrency

[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 34540bd167d15e174a617797e89a9cf3176b0579..b23723c1c702e7b0c964a7ad84b5fc61a498ac67 100644 (file)
--- a/regress/scripts/bacula-dir.conf.testrunscript.in
+++ b/regress/scripts/bacula-dir.conf.testrunscript.in
@@ -57,8 +57,58 @@ Job {
   ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
   Run After Job = "/bin/echo RunAfterJob"
   ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
+  RunScript {
+    Command = "/bin/echo ClientRunBefore1"
+    Command = "/bin/echo ClientRunBefore2"
+    Command = "/bin/echo ClientRunBefore3"
+    Command = "/bin/echo ClientRunBefore4"
+    RunsWhen = Before
+  }
+}
+
+# first, you need to unzip win32/win32_runscript.zip to c:/temp
+Job {
+  Name = "RUN_WIN32"
+  JobDefs = DefaultJob
+  FileSet = FS_TESTJOB
+  RunScript {                                              # 2.4 | 2.5 | cmd /c
+     Command = "c:\\temp\\test.bat"                        # ok  | ok  | ok
+     Command = "c:\\temp\\test.bat arg1"                   # ok  | ok  | ok
+     Command = "c:/temp/test.bat"                          # ok  | ok  | ok
+     Command = "c:/temp/test.bat arg1"                     # ok  | ok  | ok
+     Command = "c:/temp/test space.bat"                    # ok  | ok  | ok
+     Command = "c:/temp/test2 space.bat"                   # ok  | ok  | ok
+     Command = "\"c:/temp/test space.bat\" arg1"           # ok  | ok  | ok
+     Command = "\"c:/temp/dir space/test.bat\" arg1"       # ok  | ok  | ok
+     Command = "c:/temp/érïc/test.bat"                     # ERR | ok  | ok
+     Command = "c:/temp/érïc/test space.bat"               # ERR | ok  | ok
+     Command = "c:/temp/testé.bat"                         # ERR | ok  | ok
+     Command = "c:/temp/érïc/testé.bat"                    # ERR | ok  | ok
+     Command = "\"c:/temp/dir space/érïc/test.bat\""       # ERR | ERR | ok 
+     Command = "\"c:/temp/dir space/érïc/test space.bat\"" # ERR | ERR | ok 
+     Command = "c:/temp/test space.bat arg1"               # ERR | ERR | ERR
+     Command = "c:/temp/test2 space.bat arg1"              # ERR | ERR | ERR
+     Command = "c:/temp/dir space/érïc/test.bat"           # ERR | ERR | ERR 
+     Command = "c:/temp/dir space/test.bat"                # ERR | ERR | ERR
+     Command = "'c:/temp/dir space/test.bat'"              # ERR | ERR | ERR
+     Command = "\"c:/temp/éric space/test.bat\""           # ERR | ERR | ERR
+     Command = "c:/temp/éric space/test.bat"               # ERR | ERR | ERR
+     RunsWhen = Before
+     FailJobOnError = no
+  }
+}
+
+Job {
+  Name = "RUN_SUBST"
+  JobDefs = DefaultJob
+  FileSet = FS_TESTJOB
+  RunBeforeJob = "/bin/echo client_name=%c (@hostname@-fd) dir_name=%d (@hostname@-dir) jobid=%i job=%n type=%t"
+  ClientRunBeforeJob = "/bin/echo client_name=%c (@hostname@-fd) dir_name=%d (@hostname@-dir) jobid=%i job=%n type=%t"
+  ClientRunAfterJob = "/bin/echo client_name=%c (@hostname@-fd) dir_name=%d (@hostname@-dir) jobid=%i job=%n type=%t"
+  Run After Job = "/bin/echo client_name=%c (@hostname@-fd) dir_name=%d (@hostname@-dir) jobid=%i job=%n type=%t vol=%v status=%e"
 }
 
+
 #After job are after before job
 Job {
   Name = "RUN_DIR_FAILED_BUG"
@@ -94,6 +144,7 @@ Job {
   }
   RunScript {
     Command = "/bin/false RUN_FD_FAILED3"
+    Command = "/bin/false RUN_FD_FAILED4"
     failjobonerror = yes
     RunsWhen = Before
   }
@@ -112,7 +163,7 @@ Job {
 }
 
 #@hostname@-fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED1"
-#we dont execute FAILED2 
+#we don't execute FAILED2 
 #@hostname@-dir: AfterJob: run command "/bin/echo RunAfterFailedJob"
 Job {
   Name = "RUN_FD_FAILED2"
@@ -160,6 +211,7 @@ Job {
     Console = "purge volume=TestVolume001 yes"
     Console = "st dir"
     RunsWhen = Before
+    failjobonerror = no
     runsonclient = no
   }
 }
@@ -228,13 +280,14 @@ Storage {
 Catalog {
   Name = MyCatalog
   @libdbi@
-  dbname = regress; user = regress; password = ""
+  dbname = @db_name@; user = @db_user@; password = "@db_password@"
 }
 
 
 Messages {
   Name = Standard
   console = all, !skipped, !saved
+  catalog = all, !skipped
 }
 
 # Default pool definition