Commit win32 regression patch from Michael Short

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

diff --git a/regress/scripts/bacula-dir.conf.maxtime.in b/regress/scripts/bacula-dir.conf.maxtime.in
index 239d6d7790435582fa585ea4f3270f29e6db4740..9b3fc2a9fbb62986a4ccd7da6cce8ed9dbbc77e4 100644 (file)
--- a/regress/scripts/bacula-dir.conf.maxtime.in
+++ b/regress/scripts/bacula-dir.conf.maxtime.in
@@ -14,12 +14,12 @@
 
 Director {                            # define myself
   Name = @hostname@-dir
-  DIRport = 8101                # where we listen for UA connections
+  DIRPort = @dirport@                # where we listen for UA connections
   QueryFile = "@scriptdir@/query.sql"
   WorkingDirectory = "@working_dir@"
   PidDirectory = "@piddir@"
   SubSysDirectory = "@subsysdir@"
-  Maximum Concurrent Jobs = 4
+  Maximum Concurrent Jobs = 1
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"         # Console password
   Messages = Standard
 }
@@ -40,7 +40,7 @@ JobDefs {
 FileSet {
  Name = FS_TESTJOB
  Include {
-   File=</tmp/file-list
+   File=<@tmpdir@/file-list
  }
 }
 
@@ -50,7 +50,10 @@ FileSet {
    Options {
      read fifo = yes
    }
-   File=/tmp/fifo
+   # wait 60s per fifo
+   File=@tmpdir@/fifo
+   File=@tmpdir@/fifo2
+   File=@tmpdir@/fifo3
  }
 }
 
@@ -65,8 +68,9 @@ Job {
   Name = "RUN_MAXSTARTDELAY"
   JobDefs = DefaultJob
   FileSet = FS_TESTJOB
-  MaxStartDelay = 1min
+  MaxStartDelay = 30sec
   Pool = PoolA
+  Runbeforejob = "/bin/echo NEVER start this"
 }
 
 Job {
@@ -80,7 +84,7 @@ Job {
 Client {
   Name = @hostname@-fd
   Address = @hostname@
-  FDPort = 8102
+  FDPort = @fdport@
   Catalog = MyCatalog
   Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc"          # password for FileDaemon
   File Retention = 30d                # 30 days
@@ -93,7 +97,7 @@ Client {
 Storage {
   Name = File
   Address = @hostname@                # N.B. Use a fully qualified name here
-  SDPort = 8103
+  SDPort = @sdport@
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = FileStorage
   Media Type = File