From 3f971b0055a5ad0e6af7b6923556e4263a119d7d Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 7 Mar 2024 22:22:29 +0300
Subject: Add support for build-auxiliary package manifest value

---
 libbpkg/manifest.cxx       | 205 +++++++++++++++++++++++++++++++++++++++---
 libbpkg/manifest.hxx       |  82 ++++++++++++++---
 tests/manifest/testscript  | 219 +++++++++++++++++++++++++++++++++++++++++++++
 tests/overrides/testscript | 169 ++++++++++++++++++++++++++++++++++
 4 files changed, 649 insertions(+), 26 deletions(-)

diff --git a/libbpkg/manifest.cxx b/libbpkg/manifest.cxx
index 923b113..065f055 100644
--- a/libbpkg/manifest.cxx
+++ b/libbpkg/manifest.cxx
@@ -3069,6 +3069,44 @@ namespace bpkg
     match_classes (cs, im, expr, r);
   }
 
+  // build_auxiliary
+  //
+  optional<pair<string, string>> build_auxiliary::
+  parse_value_name (const string& n)
+  {
+    // Check if the value name matches exactly.
+    //
+    if (n == "build-auxiliary")
+      return make_pair (string (), string ());
+
+    // Check if this is a *-build-auxiliary name.
+    //
+    if (n.size () > 16 &&
+        n.compare (n.size () - 16, 16, "-build-auxiliary") == 0)
+    {
+      return make_pair (string (n, 0, n.size () - 16), string ());
+    }
+
+    // Check if this is a build-auxiliary-* name.
+    //
+    if (n.size () > 16 && n.compare (0, 16, "build-auxiliary-") == 0)
+      return make_pair (string (), string (n, 16));
+
+    // Check if this is a *-build-auxiliary-* name.
+    //
+    size_t p (n.find ("-build-auxiliary-"));
+
+    if (p != string::npos   &&
+        p != 0              && // Not '-build-auxiliary-*'?
+        p + 17 != n.size () && // Not '*-build-auxiliary-'?
+        n.find ("-build-auxiliary-", p + 17) == string::npos) // Unambiguous?
+    {
+      return make_pair (string (n, 0, p), string (n, p + 17));
+    }
+
+    return nullopt;
+  }
+
   // test_dependency_type
   //
   string
@@ -3318,6 +3356,33 @@ namespace bpkg
     return email (move (v), move (c));
   }
 
+  // Parse the [*-]build-auxiliary[-*] manifest value.
+  //
+  // Note that the environment name is expected to already be retrieved using
+  // build_auxiliary::parse_value_name().
+  //
+  static build_auxiliary
+  parse_build_auxiliary (const name_value& nv,
+                         string&& env_name,
+                         const string& source_name)
+  {
+    auto bad_value = [&nv, &source_name] (const string& d)
+    {
+      throw !source_name.empty ()
+            ? parsing (source_name, nv.value_line, nv.value_column, d)
+            : parsing (d);
+    };
+
+    pair<string, string> vc (parser::split_comment (nv.value));
+    string& v (vc.first);
+    string& c (vc.second);
+
+    if (v.empty ())
+      bad_value ("empty build auxiliary configuration name pattern");
+
+    return build_auxiliary (move (env_name), move (v), move (c));
+  }
+
   const version stub_version (0, "0", nullopt, nullopt, 0);
 
   // Parse until next() returns end-of-manifest value.
@@ -3340,16 +3405,37 @@ namespace bpkg
     auto bad_value ([&name, &nv](const string& d) {
         throw parsing (name, nv.value_line, nv.value_column, d);});
 
-    auto parse_email = [&bad_name] (const name_value& nv,
-                                    optional<email>& r,
-                                    const char* what,
-                                    const string& source_name,
-                                    bool empty = false)
+    auto parse_email = [&bad_name, &name] (const name_value& nv,
+                                           optional<email>& r,
+                                           const char* what,
+                                           bool empty = false)
     {
       if (r)
         bad_name (what + string (" email redefinition"));
 
-      r = bpkg::parse_email (nv, what, source_name, empty);
+      r = bpkg::parse_email (nv, what, name, empty);
+    };
+
+    // Parse the [*-]build-auxiliary[-*] manifest value and append it to the
+    // specified build auxiliary list. Make sure that the list contains not
+    // more than one entry with unspecified environment name and throw parsing
+    // if that's not the case. Also make sure that there are no entry
+    // redefinitions (multiple entries with the same environment name).
+    //
+    auto parse_build_auxiliary = [&bad_name, &name] (const name_value& nv,
+                                                     string&& en,
+                                                     vector<build_auxiliary>& r)
+    {
+      build_auxiliary a (bpkg::parse_build_auxiliary (nv, move (en), name));
+
+      if (find_if (r.begin (), r.end (),
+                   [&a] (const build_auxiliary& ba)
+                   {
+                     return ba.environment_name == a.environment_name;
+                   }) != r.end ())
+        bad_name ("build auxiliary environment redefinition");
+
+      r.push_back (move (a));
     };
 
     auto parse_url = [&bad_value] (const string& v,
@@ -3908,7 +3994,7 @@ namespace bpkg
       }
       else if (n == "email")
       {
-        parse_email (nv, m.email, "project", name);
+        parse_email (nv, m.email, "project");
       }
       else if (n == "doc-url")
       {
@@ -3933,19 +4019,19 @@ namespace bpkg
       }
       else if (n == "package-email")
       {
-        parse_email (nv, m.package_email, "package", name);
+        parse_email (nv, m.package_email, "package");
       }
       else if (n == "build-email")
       {
-        parse_email (nv, m.build_email, "build", name, true /* empty */);
+        parse_email (nv, m.build_email, "build", true /* empty */);
       }
       else if (n == "build-warning-email")
       {
-        parse_email (nv, m.build_warning_email, "build warning", name);
+        parse_email (nv, m.build_warning_email, "build warning");
       }
       else if (n == "build-error-email")
       {
-        parse_email (nv, m.build_error_email, "build error", name);
+        parse_email (nv, m.build_error_email, "build error");
       }
       else if (n == "priority")
       {
@@ -4019,6 +4105,19 @@ namespace bpkg
         m.build_constraints.push_back (
           parse_build_constraint (nv, true /* exclusion */, name));
       }
+      else if (optional<pair<string, string>> ba =
+               build_auxiliary::parse_value_name (n))
+      {
+        if (ba->first.empty ()) // build-auxiliary*?
+        {
+          parse_build_auxiliary (nv, move (ba->second), m.build_auxiliaries);
+        }
+        else                    // *-build-auxiliary*
+        {
+          build_package_config& bc (build_conf (move (ba->first)));
+          parse_build_auxiliary (nv, move (ba->second), bc.auxiliaries);
+        }
+      }
       else if (n.size () > 13 &&
                n.compare (n.size () - 13, 13, "-build-config") == 0)
       {
@@ -4440,8 +4539,7 @@ namespace bpkg
     // Note: the argument can only be one of the build_config_*emails
     // variables (see above) to distinguish between the email kinds.
     //
-    auto parse_build_config_emails = [&name,
-                                      &nv,
+    auto parse_build_config_emails = [&nv,
                                       &build_config_emails,
                                       &build_config_warning_emails,
                                       &build_config_error_emails,
@@ -4479,7 +4577,6 @@ namespace bpkg
           (ek == email_kind::build   ? "build configuration"         :
            ek == email_kind::warning ? "build configuration warning" :
            "build configuration error"),
-          name,
           ek == email_kind::build /* empty */);
       }
     };
@@ -4829,6 +4926,15 @@ namespace bpkg
     //
     vector<size_t> obes;
 
+    // Return true if the specified package build configuration is newly
+    // created by the *-build-config override.
+    //
+    auto config_created = [&m, confs_num = m.build_configs.size ()]
+                          (const build_package_config& c)
+    {
+      return &c >= m.build_configs.data () + confs_num;
+    };
+
     // Apply overrides.
     //
     for (const manifest_name_value& nv: nvs)
@@ -5050,6 +5156,45 @@ namespace bpkg
         return r;
       };
 
+      // Parse the [*-]build-auxiliary[-*] value override. If the mode is not
+      // validate-only, then override the matching value and throw
+      // manifest_parsing if no match. But throw only unless this is a
+      // configuration-specific override (build_config is not NULL) for a
+      // newly created configuration, in which case add the value instead.
+      //
+      auto override_build_auxiliary =
+        [&bad_name,
+         &name,
+         &config_created,
+         validate_only] (const name_value& nv,
+                         string&& en,
+                         vector<build_auxiliary>& r,
+                         build_package_config* build_config = nullptr)
+      {
+        build_auxiliary a (bpkg::parse_build_auxiliary (nv, move (en), name));
+
+        if (!validate_only)
+        {
+          auto i (find_if (r.begin (), r.end (),
+                           [&a] (const build_auxiliary& ba)
+                           {
+                             return ba.environment_name == a.environment_name;
+                           }));
+
+          if (i != r.end ())
+          {
+            *i = move (a);
+          }
+          else
+          {
+            if (build_config != nullptr && config_created (*build_config))
+              r.emplace_back (move (a));
+            else
+              bad_name ("no match for '" + nv.name + "' value override");
+          }
+        }
+      };
+
       const string& n (nv.name);
 
       if (n == "builds")
@@ -5145,6 +5290,21 @@ namespace bpkg
 
         bc.error_email = parse_email (nv, "build configuration error", name);
       }
+      else if (optional<pair<string, string>> ba =
+               build_auxiliary::parse_value_name (n))
+      {
+        if (ba->first.empty ()) // build-auxiliary*?
+        {
+          override_build_auxiliary (nv, move (ba->second), m.build_auxiliaries);
+        }
+        else                    // *-build-auxiliary*
+        {
+          build_package_config& bc (
+            build_conf (ba->first.size (), validate_only));
+
+          override_build_auxiliary (nv, move (ba->second), bc.auxiliaries, &bc);
+        }
+      }
       else
         bad_name ("cannot override '" + n + "' value");
     }
@@ -5516,6 +5676,12 @@ namespace bpkg
                                            : c.config + '/' + *c.target,
                                            c.comment));
 
+      for (const build_auxiliary& ba: m.build_auxiliaries)
+        s.next ((!ba.environment_name.empty ()
+                 ? "build-auxiliary-" + ba.environment_name
+                 : "build-auxiliary"),
+                serializer::merge_comment (ba.config, ba.comment));
+
       for (const build_package_config& bc: m.build_configs)
       {
         if (!bc.builds.empty ())
@@ -5538,6 +5704,17 @@ namespace bpkg
                                                c.comment));
         }
 
+        if (!bc.auxiliaries.empty ())
+        {
+          string n (bc.name + "-build-auxiliary");
+
+          for (const build_auxiliary& ba: bc.auxiliaries)
+            s.next ((!ba.environment_name.empty ()
+                     ? n + '-' + ba.environment_name
+                     : n),
+                    serializer::merge_comment (ba.config, ba.comment));
+        }
+
         if (!bc.arguments.empty () || !bc.comment.empty ())
           s.next (bc.name + "-build-config",
                   serializer::merge_comment (bc.arguments, bc.comment));
diff --git a/libbpkg/manifest.hxx b/libbpkg/manifest.hxx
index 834b681..4b0ccc6 100644
--- a/libbpkg/manifest.hxx
+++ b/libbpkg/manifest.hxx
@@ -10,7 +10,7 @@
 #include <cassert>
 #include <cstdint>    // uint*_t
 #include <ostream>
-#include <utility>    // move()
+#include <utility>    // move(), pair
 #include <functional>
 
 #include <libbutl/url.hxx>
@@ -980,6 +980,39 @@ namespace bpkg
     return os << bce.string ();
   }
 
+  // Build auxiliary configuration name-matching wildcard. Includes optional
+  // environment name (specified as a suffix in the [*-]build-auxiliary[-*]
+  // value name) and comment.
+  //
+  class LIBBPKG_EXPORT build_auxiliary
+  {
+  public:
+    std::string environment_name;
+
+    // Filesystem wildcard pattern for the build auxiliary configuration name.
+    //
+    std::string config;
+
+    std::string comment;
+
+    build_auxiliary () = default;
+    build_auxiliary (std::string en,
+                     std::string cf,
+                     std::string cm)
+        : environment_name (std::move (en)),
+          config (std::move (cf)),
+          comment (std::move (cm)) {}
+
+    // Parse a package manifest value name in the [*-]build-auxiliary[-*] form
+    // into the pair of the build package configuration name (first) and the
+    // build auxiliary environment name (second), with an unspecified name
+    // represented as an empty string. Return nullopt if the value name
+    // doesn't match this form.
+    //
+    static butl::optional<std::pair<std::string, std::string>>
+    parse_value_name (const std::string&);
+  };
+
   // Package build configuration. Includes comment and optional overrides for
   // target build configuration class expressions/constraints and build
   // notification emails.
@@ -1002,6 +1035,11 @@ namespace bpkg
     butl::small_vector<build_class_expr, 1> builds;
     std::vector<build_constraint> constraints;
 
+    // Note that all entries in this list must have distinct environment names
+    // (with empty name being one of the possibilities).
+    //
+    std::vector<build_auxiliary> auxiliaries;
+
     butl::optional<email_type> email;
     butl::optional<email_type> warning_email;
     butl::optional<email_type> error_email;
@@ -1032,6 +1070,16 @@ namespace bpkg
       return !builds.empty () || !constraints.empty () ? constraints : common;
     }
 
+    // Return the configuration's auxiliaries, if specified, and the common
+    // ones otherwise.
+    //
+    const std::vector<build_auxiliary>&
+    effective_auxiliaries (const std::vector<build_auxiliary>& common) const
+      noexcept
+    {
+      return !auxiliaries.empty () ? auxiliaries : common;
+    }
+
     // Return the configuration's build notification emails if they override
     // the specified common build notification emails and return the latter
     // otherwise (see package_manifest::override() for the override semantics
@@ -1205,11 +1253,15 @@ namespace bpkg
     std::vector<requirement_alternatives> requirements;
     butl::small_vector<test_dependency, 1> tests;
 
-    // Common build classes/constraints that apply to all configurations
-    // unless overridden.
+    // Common build classes, constraints, and auxiliaries that apply to all
+    // configurations unless overridden.
+    //
+    // Note that all entries in build_auxiliaries must have distinct
+    // environment names (with empty name being one of the possibilities).
     //
     butl::small_vector<build_class_expr, 1> builds;
     std::vector<build_constraint> build_constraints;
+    std::vector<build_auxiliary> build_auxiliaries;
 
     // Note that the parsing constructor adds the implied (empty) default
     // configuration at the beginning of the list. Also note that serialize()
@@ -1357,9 +1409,12 @@ namespace bpkg
     // any value is invalid, cannot be overridden, or its name is not
     // recognized.
     //
-    // The specified values override the whole groups they belong to,
-    // resetting all the group values prior to being applied. Currently, only
-    // the following value groups can be overridden:
+    // The specified values other than [*-]build-auxiliary[-*] override the
+    // whole groups they belong to, resetting all the group values prior to
+    // being applied. The [*-]build-auxiliary[-*] values only override the
+    // matching values, which are expected to already be present in the
+    // manifest. Currently, only the following value groups/values can be
+    // overridden:
     //
     //   {build-*email}
     //   {builds, build-{include,exclude}}
@@ -1367,13 +1422,16 @@ namespace bpkg
     //   {*-build-config}
     //   {*-build-*email}
     //
+    //   [*-]build-auxiliary[-*]
+    //
     // Throw manifest_parsing if the configuration specified by the build
-    // package configuration-specific build constraints or emails group value
-    // overrides doesn't exists. In contrast, for the build config override
-    // add a new configuration if it doesn't exist and update the arguments of
-    // the existing configuration otherwise. In the former case, all the
-    // potential build constraints and emails overrides for such a newly added
-    // configuration must follow the respective *-build-config override.
+    // package configuration-specific build constraint, email, or auxiliary
+    // value override doesn't exists. In contrast, for the build config
+    // override add a new configuration if it doesn't exist and update the
+    // arguments of the existing configuration otherwise. In the former case,
+    // all the potential build constraint, email, and auxiliary overrides for
+    // such a newly added configuration must follow the respective
+    // *-build-config override.
     //
     // Note that the build constraints group values (both common and build
     // config-specific) are overridden hierarchically so that the
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
+  }
 }
-- 
cgit v1.1