From 6eecad33923ae7052086866756d7e4697fe7bbd3 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 2 Apr 2020 22:22:46 +0300 Subject: Add support for test-exclude task manifest value --- libbbot/manifest.hxx | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'libbbot/manifest.hxx') 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 #include +#include #include #include #include @@ -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 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 te, std::string mn, butl::target_triplet tg, butl::optional 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)), -- cgit v1.1