diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2020-04-02 22:22:46 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2020-04-05 12:19:51 +0300 |
commit | 6eecad33923ae7052086866756d7e4697fe7bbd3 (patch) | |
tree | fd7997a56806609617c1315001ff4ad669cfb6be /libbbot/manifest.hxx | |
parent | e99fe489d98be215e13aba8e026c953555ef0029 (diff) |
Add support for test-exclude task manifest value
Diffstat (limited to 'libbbot/manifest.hxx')
-rw-r--r-- | libbbot/manifest.hxx | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/libbbot/manifest.hxx b/libbbot/manifest.hxx index bbe7055..daee743 100644 --- a/libbbot/manifest.hxx +++ b/libbbot/manifest.hxx @@ -9,6 +9,7 @@ #include <ostream> #include <libbutl/optional.mxx> +#include <libbutl/small-vector.mxx> #include <libbutl/target-triplet.mxx> #include <libbutl/standard-version.mxx> #include <libbutl/manifest-forward.hxx> @@ -34,7 +35,6 @@ namespace bbot : id (std::move (i)), name (std::move (n)), summary (std::move (s)) {} public: - machine_header_manifest () = default; // VC export. machine_header_manifest ( @@ -102,6 +102,12 @@ namespace bbot serialize (butl::manifest_serializer&) const; }; + struct package + { + bpkg::package_name name; + bpkg::version version; + }; + class LIBBBOT_EXPORT task_manifest { public: @@ -117,6 +123,11 @@ namespace bbot // strings trust; + // Separate tests, examples, and benchmarks packages that should be + // excluded from building together with the primary package. + // + butl::small_vector<package, 1> test_exclusions; + std::string machine; // Build machine to use for building the package. butl::target_triplet target; // Build target. @@ -145,6 +156,7 @@ namespace bbot bpkg::version vr, bpkg::repository_location rl, strings tr, + butl::small_vector<package, 1> te, std::string mn, butl::target_triplet tg, butl::optional<std::string> en, @@ -153,7 +165,8 @@ namespace bbot : name (std::move (nm)), version (std::move (vr)), repository (std::move (rl)), - trust (tr), + trust (std::move (tr)), + test_exclusions (std::move (te)), machine (std::move (mn)), target (std::move (tg)), environment (std::move (en)), |