Add support for build-auxiliary package manifest value

2 files changed, 388 insertions, 0 deletions

diff --git a/tests/manifest/testscript b/tests/manifest/testscript
index 4f6433b..488668c 100644
--- a/tests/manifest/testscript
+++ b/tests/manifest/testscript
@@ -1048,6 +1048,116 @@
       EOI
   }
 
+  : build-auxiliary
+  :
+  {
+    : named
+    :
+    {
+      $* <<EOF >>EOF
+        : 1
+        name: foo
+        version: 2.0.0
+        summary: Modern C++ parser
+        license: LGPLv2
+        build-auxiliary-pgsql: *-postgresql_*
+        build-auxiliary-mysql: *-mysql_*
+        EOF
+    }
+
+    : unnamed
+    :
+    {
+      $* <<EOF >>EOF
+        : 1
+        name: foo
+        version: 2.0.0
+        summary: Modern C++ parser
+        license: LGPLv2
+        build-auxiliary: *-postgresql**
+        EOF
+    }
+
+    : empty-config-pattern
+    :
+    {
+      $* <<EOI 2>>EOE != 0
+        : 1
+        name: foo
+        version: 2.0.0
+        summary: Modern C++ parser
+        license: LGPLv2
+        build-auxiliary:
+        EOI
+        stdin:6:17: error: empty build auxiliary configuration name pattern
+        EOE
+    }
+
+    : mixed
+    :
+    {
+      : named-unnamed
+      :
+      {
+        $* <<EOF >>EOF
+          : 1
+          name: foo
+          version: 2.0.0
+          summary: Modern C++ parser
+          license: LGPLv2
+          build-auxiliary-pgsql: *-postgresql**
+          build-auxiliary: *-mysql**
+          EOF
+      }
+
+      : unnamed-named
+      :
+      {
+        $* <<EOF >>EOF
+          : 1
+          name: foo
+          version: 2.0.0
+          summary: Modern C++ parser
+          license: LGPLv2
+          build-auxiliary: *-mysql**
+          build-auxiliary-pgsql: *-postgresql**
+          EOF
+      }
+
+      : unnamed-unnamed
+      :
+      {
+        $* <<EOI 2>>EOE != 0
+          : 1
+          name: foo
+          version: 2.0.0
+          summary: Modern C++ parser
+          license: LGPLv2
+          build-auxiliary: *-mysql**
+          build-auxiliary: *-postgresql**
+          EOI
+          stdin:7:1: error: build auxiliary environment redefinition
+          EOE
+      }
+
+      : redefinition
+      :
+      {
+        $* <<EOI 2>>EOE != 0
+          : 1
+          name: foo
+          version: 2.0.0
+          summary: Modern C++ parser
+          license: LGPLv2
+          build-auxiliary-pgsql: *-postgresql**
+          build-auxiliary-pgsql: *-postgresql**
+          EOI
+          stdin:7:1: error: build auxiliary environment redefinition
+          EOE
+      }
+    }
+  }
+
   : build-config
   :
   {
@@ -1112,6 +1222,115 @@
         EOI
     }
 
+    : auxiliary
+    {
+      : named
+      :
+      {
+        $* <<EOF >>EOF
+          : 1
+          name: foo
+          version: 2.0.0
+          summary: Modern C++ parser
+          license: LGPLv2
+          bar-build-auxiliary-pgsql: *-postgresql_*
+          baz-build-auxiliary-mysql: *-mysql_*
+          EOF
+      }
+
+      : unnamed
+      :
+      {
+        $* <<EOF >>EOF
+          : 1
+          name: foo
+          version: 2.0.0
+          summary: Modern C++ parser
+          license: LGPLv2
+          bar-build-auxiliary: *-postgresql**
+          EOF
+      }
+
+      : empty-config-pattern
+      :
+      {
+        $* <<EOI 2>>EOE != 0
+          : 1
+          name: foo
+          version: 2.0.0
+          summary: Modern C++ parser
+          license: LGPLv2
+          bar-build-auxiliary:
+          EOI
+          stdin:6:21: error: empty build auxiliary configuration name pattern
+          EOE
+      }
+
+      : mixed
+      :
+      {
+        : named-unnamed
+        :
+        {
+          $* <<EOF >>EOF
+            : 1
+            name: foo
+            version: 2.0.0
+            summary: Modern C++ parser
+            license: LGPLv2
+            bar-build-auxiliary-pgsql: *-postgresql**
+            bar-build-auxiliary: *-mysql**
+            EOF
+        }
+
+        : unnamed-named
+        :
+        {
+          $* <<EOF >>EOF
+            : 1
+            name: foo
+            version: 2.0.0
+            summary: Modern C++ parser
+            license: LGPLv2
+            bar-build-auxiliary: *-mysql**
+            bar-build-auxiliary-pgsql: *-postgresql**
+            EOF
+        }
+
+        : unnamed-unnamed
+        :
+        {
+          $* <<EOI 2>>EOE != 0
+            : 1
+            name: foo
+            version: 2.0.0
+            summary: Modern C++ parser
+            license: LGPLv2
+            bar-build-auxiliary: *-mysql**
+            bar-build-auxiliary: *-postgresql**
+            EOI
+            stdin:7:1: error: build auxiliary environment redefinition
+            EOE
+        }
+
+        : redefinition
+        :
+        {
+          $* <<EOI 2>>EOE != 0
+            : 1
+            name: foo
+            version: 2.0.0
+            summary: Modern C++ parser
+            license: LGPLv2
+            bar-build-auxiliary-pgsql: *-postgresql**
+            bar-build-auxiliary-pgsql: *-postgresql**
+            EOI
+            stdin:7:1: error: build auxiliary environment redefinition
+            EOE
+        }
+      }
+    }
+
     : email
     :
     {
diff --git a/tests/overrides/testscript b/tests/overrides/testscript
index ba66b7f..60168a4 100644
--- a/tests/overrides/testscript
+++ b/tests/overrides/testscript
@@ -254,6 +254,84 @@
     license: LGPLv2
     build-email: foo@example.com
     EOO
+
+  : build-auxiliary
+  :
+  {
+    : named
+    :
+    $* 'build-auxiliary-pgsql: *-postgresql**' \
+       'foo-build-auxiliary-oracle: *-oracle**' <<EOI >>EOO
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-auxiliary-pgsql: *-postgresql_*
+      build-auxiliary-mysql: *-mysql_*
+      foo-build-auxiliary-mssql: *-mssql_*
+      foo-build-auxiliary-oracle: *-oracle_*
+      EOI
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-auxiliary-pgsql: *-postgresql**
+      build-auxiliary-mysql: *-mysql_*
+      foo-build-auxiliary-mssql: *-mssql_*
+      foo-build-auxiliary-oracle: *-oracle**
+      EOO
+
+    : unnamed
+    :
+    $* 'build-auxiliary: *-postgresql**' \
+       'foo-build-auxiliary: *-oracle**' <<EOI >>EOO
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-auxiliary: *-postgresql_*
+      foo-build-auxiliary: *-oracle_*
+      EOI
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-auxiliary: *-postgresql**
+      foo-build-auxiliary: *-oracle**
+      EOO
+
+    : new-config
+    :
+    $* 'bar-build-config:' \
+       'bar-build-auxiliary-mysql: *-mysql_8' \
+       'bar-build-auxiliary-pgsql: *-postgresql_16' <<EOI >>EOO
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-auxiliary-pgsql: *-postgresql_*
+      build-auxiliary-mssql: *-mssql_*
+      foo-build-auxiliary-mysql: *-mysql_*
+      foo-build-auxiliary-oracle: *-oracle_*
+      EOI
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-auxiliary-pgsql: *-postgresql_*
+      build-auxiliary-mssql: *-mssql_*
+      foo-build-auxiliary-mysql: *-mysql_*
+      foo-build-auxiliary-oracle: *-oracle_*
+      bar-build-auxiliary-mysql: *-mysql_8
+      bar-build-auxiliary-pgsql: *-postgresql_16
+      EOO
+  }
 }
 
 : invalid
@@ -395,4 +473,95 @@
     EOI
     'build-email' override specified together with 'network-build-warning-email' override
     EOE
+
+  : build-auxiliary
+  :
+  {
+    : named-common
+    :
+    $* 'build-auxiliary-mysql: *-mysql_*' <<EOI 2>>EOE != 0
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-auxiliary-pgsql: *-postgresql_*
+      foo-build-auxiliary-mssql: *-mssql_*
+      foo-build-auxiliary-oracle: *-oracle_*
+      EOI
+      no match for 'build-auxiliary-mysql' value override
+      EOE
+
+    : named-config1
+    :
+    $* 'foo-build-auxiliary-mysql: *-mysql_*' <<EOI 2>>EOE != 0
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-auxiliary-pgsql: *-postgresql_*
+      foo-build-auxiliary-mssql: *-mssql_*
+      foo-build-auxiliary-oracle: *-oracle_*
+      EOI
+      no match for 'foo-build-auxiliary-mysql' value override
+      EOE
+
+    : named-config2
+    :
+    $* 'bar-build-auxiliary-oracle: *-oracle**' <<EOI 2>>EOE != 0
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-auxiliary-pgsql: *-postgresql_*
+      foo-build-auxiliary-mssql: *-mssql_*
+      foo-build-auxiliary-oracle: *-oracle_*
+      EOI
+      cannot override 'bar-build-auxiliary-oracle' value: no build package configuration 'bar'
+      EOE
+
+    : unnamed-common
+    :
+    $* 'build-auxiliary-mysql: *-mysql_*' <<EOI 2>>EOE != 0
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-auxiliary: *-postgresql_*
+      foo-build-auxiliary: *-oracle_*
+      EOI
+      no match for 'build-auxiliary-mysql' value override
+      EOE
+
+    : unnamed-config1
+    :
+    $* 'foo-build-auxiliary-mysql: *-mysql_*' <<EOI 2>>EOE != 0
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-auxiliary: *-postgresql_*
+      foo-build-auxiliary: *-oracle_*
+      EOI
+      no match for 'foo-build-auxiliary-mysql' value override
+      EOE
+
+    : unnamed-config2
+    :
+    $* 'bar-build-auxiliary: *-mysql_*' <<EOI 2>>EOE != 0
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-auxiliary: *-postgresql_*
+      foo-build-auxiliary: *-oracle_*
+      EOI
+      cannot override 'bar-build-auxiliary' value: no build package configuration 'bar'
+      EOE
+  }
 }