Add support for auxiliary-machine package manifest value

3 files changed, 64 insertions, 0 deletions

diff --git a/tests/manifest/machine-header.testscript b/tests/manifest/machine-header.testscript
index 84295d2..559a107 100644
--- a/tests/manifest/machine-header.testscript
+++ b/tests/manifest/machine-header.testscript
@@ -13,6 +13,8 @@ test.options += -m
   id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
   name: windows_10-msvc_14
   summary: Windows 10 build 1607 with VC 14 update 3
+  role: build
+  ram-minimum: 4194304
   EOF
 }
 
@@ -52,6 +54,22 @@ EOI
   summary: Windows
   summary: Windows
   EOI
+
+  : ram-maximum
+  :
+  $* <<EOI 2>'stdin:3:1: error: machine maximum RAM redefinition' == 1
+  : 1
+  ram-maximum: 4194304
+  ram-maximum: 4194304
+  EOI
+
+  : role
+  :
+  $* <<EOI 2>'stdin:3:1: error: machine role redefinition' == 1
+  : 1
+  role: build
+  role: auxiliary
+  EOI
 }
 
 : empty
diff --git a/tests/manifest/task-request.testscript b/tests/manifest/task-request.testscript
index 85801a9..79f3982 100644
--- a/tests/manifest/task-request.testscript
+++ b/tests/manifest/task-request.testscript
@@ -18,6 +18,7 @@ test.options += -tq
   interactive-mode: both
   interactive-login: 10.5.0.1:5901
   fingerprint: 1105fb394ee870adb154b7abfbbae5755df7dcef6c81db34e8d1b68d2653734e
+  auxiliary-ram: 41943040
   :
   id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
   name: windows_10-msvc_14
@@ -72,6 +73,14 @@ test.options += -tq
   fingerprint: 1105fb394ee870adb154b7abfbbae5755df7dcef6c81db34e8d1b68d2653734e
   fingerprint: 1105fb394ee870adb154b7abfbbae5755df7dcef6c81db34e8d1b68d2653734e
   EOI
+
+  : auxiliary-ram
+  :
+  $* <<EOI 2>'stdin:3:1: error: auxiliary machines RAM limit redefinition' == 1
+  : 1
+  auxiliary-ram: 41943040
+  auxiliary-ram: 41943040
+  EOI
 }
 
 : empty
@@ -90,6 +99,13 @@ test.options += -tq
   : 1
   toolchain-name:
   EOI
+
+  : auxiliary-ram
+  :
+  $* <<EOI 2>'stdin:2:15: error: auxiliary machines RAM limit should be 64-bit unsigned integer' == 1
+  : 1
+  auxiliary-ram:
+  EOI
 }
 
 : invalid-toolchain-version
diff --git a/tests/manifest/task.testscript b/tests/manifest/task.testscript
index d224124..8320f59 100644
--- a/tests/manifest/task.testscript
+++ b/tests/manifest/task.testscript
@@ -22,8 +22,14 @@ test.options += -t
   examples: foo-examples
   dependency-checksum: 12345
   machine: windows_10-msvc_14
+  auxiliary-machine-pgsql: x86_64-linux_debian_12-postgresql_16
+  auxiliary-machine: x86_64-linux_debian_12-mysql*
   target: x86_64-microsoft-win32-msvc14.0
   environment: lld
+  auxiliary-environment:\
+  PGSQL_DATABASE_HOST=192.168.0.1
+  PGSQL_DATABASE_PORT=1245
+  \
   target-config: config.cc.coptions=/Z7 config.cc.loptions=/DEBUG
   package-config: config.foo.network=true
   warning-regex: '^warning: ' '^.+: warning: '
@@ -248,6 +254,14 @@ test.options += -t
   machine: windows_10-msvc_14
   EOI
 
+  : auxiliary-machine
+  :
+  $* <<EOI 2>'stdin:3:1: error: task auxiliary machine environment redefinition' == 1
+  : 1
+  auxiliary-machine-pgsql: x86_64-linux_debian_12-postgresql_16
+  auxiliary-machine-pgsql: x86_64-linux_debian_12-postgresql_14
+  EOI
+
   : target
   :
   $* <<EOI 2>'stdin:3:1: error: task target redefinition' == 1
@@ -256,6 +270,22 @@ test.options += -t
   target: x86_64-microsoft-win32-msvc14.0
   EOI
 
+  : auxiliary-environment
+  :
+  $* <<EOI 2>'stdin:7:1: error: task auxiliary environment redefinition' == 1
+  : 1
+  auxiliary-environment:
+  \
+  PGSQL_DATABASE_HOST=192.168.0.1
+  PGSQL_DATABASE_PORT=1245
+  \
+  auxiliary-environment:
+  \
+  PGSQL_DATABASE_HOST=192.168.0.1
+  PGSQL_DATABASE_PORT=1245
+  \
+  EOI
+
   : config
   :
   $* <<EOI 2>'stdin:3:1: error: task target configuration redefinition' == 1