Tweak get_os

[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 522a7fde22f34e507f53324f2639a896fc437724..d569dd4b622ae9fa250c314b66d105db59f16015 100644 (file)
--- a/regress/scripts/bacula-dir.conf.testrunscript.in
+++ b/regress/scripts/bacula-dir.conf.testrunscript.in
@@ -14,7 +14,7 @@
 
 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@"
@@ -40,7 +40,7 @@ JobDefs {
 FileSet {
  Name = FS_TESTJOB
  Include {
-   File=</tmp/file-list
+   File=<@tmpdir@/file-list
  }
 }
 
@@ -87,11 +87,12 @@ Job {
   JobDefs = DefaultJob
   RunScript {
     Command = "/bin/false RUN_FD_FAILED1"
+    Command = "/bin/false RUN_FD_FAILED2"
     failjobonerror = no
     RunsWhen = Before
   }
   RunScript {
-    Command = "/bin/false RUN_FD_FAILED2"
+    Command = "/bin/false RUN_FD_FAILED3"
     failjobonerror = yes
     RunsWhen = Before
   }
@@ -154,7 +155,7 @@ FileSet {
  Name = FS_FIFO
  Include {
    Options { readfifo = yes }
-   File=</tmp/file-list
+   File=<@tmpdir@/file-list
  }
 }
 
@@ -164,12 +165,12 @@ Job {
   FileSet = FS_FIFO
 
   RunScript {
-    Command = "/bin/echo touching /tmp/RUN_BUG_897"
+    Command = "/bin/echo touching @tmpdir@/RUN_BUG_897"
     RunsWhen = after
     RunsOnFailure = yes
   }
   RunScript {
-    Command = "/bin/touch /tmp/RUN_BUG_897"
+    Command = "/bin/touch @tmpdir@/RUN_BUG_897"
     RunsWhen = after
     RunsOnFailure = yes
   }
@@ -179,7 +180,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
@@ -192,7 +193,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