Add support for test-exclude task manifest valuemigration-example

Note that the last two commits demonstrate an approach to use for migrating
data on the ODB object member type change.

2 files changed, 38 insertions, 7 deletions

diff --git a/mod/mod-build-task.cxx b/mod/mod-build-task.cxx
index edddb89..3eaa0d3 100644
--- a/mod/mod-build-task.cxx
+++ b/mod/mod-build-task.cxx
@@ -220,14 +220,44 @@ handle (request& rq, response& rs)
 
       lazy_shared_ptr<build_repository> r (p->internal_repository);
 
-      strings fp;
+      strings fps;
       if (r->certificate_fingerprint)
-        fp.emplace_back (move (*r->certificate_fingerprint));
+        fps.emplace_back (move (*r->certificate_fingerprint));
+
+      // Exclude external test packages which exclude the task build
+      // configuration.
+      //
+      small_vector<package, 1> tes;
+      auto add_exclusions = [&tes, &cm, this]
+                            (const small_vector<build_dependency, 1>& tests)
+      {
+        for (const build_dependency& t: tests)
+        {
+          // Don't exclude unresolved external tests.
+          //
+          // Note that this may result in the build task failure. However,
+          // silently excluding such tests could end up with missed software
+          // bugs which feels much worse.
+          //
+          if (t.package != nullptr)
+          {
+            shared_ptr<build_package> p (t.package.load ());
+
+            if (exclude (p->builds, p->constraints, *cm.config))
+              tes.push_back (package {move (p->id.name), move (p->version)});
+          }
+        }
+      };
+
+      add_exclusions (p->tests);
+      add_exclusions (p->examples);
+      add_exclusions (p->benchmarks);
 
       task_manifest task (move (b->package_name),
                           move (b->package_version),
                           move (r->location),
-                          move (fp),
+                          move (fps),
+                          move (tes),
                           cm.machine->name,
                           cm.config->target,
                           cm.config->environment,
@@ -595,7 +625,7 @@ handle (request& rq, response& rs)
             //
             // We iterate over buildable packages.
             //
-            assert (p->internal_repository != nullptr);
+            assert (p->internal ());
 
             p->internal_repository.load ();
 
@@ -677,8 +707,8 @@ handle (request& rq, response& rs)
             shared_ptr<build_package> p (
               build_db_->find<build_package> (b->id.package));
 
-            if (p != nullptr                      &&
-                p->internal_repository != nullptr &&
+            if (p != nullptr   &&
+                p->internal () &&
                 !exclude (p->builds, p->constraints, *cm.config))
             {
               assert (b->status);
diff --git a/mod/mod-package-version-details.cxx b/mod/mod-package-version-details.cxx
index bfc08b0..22c1cf5 100644
--- a/mod/mod-package-version-details.cxx
+++ b/mod/mod-package-version-details.cxx
@@ -430,7 +430,8 @@ handle (request& rq, response& rs)
   print_dependencies (pkg->examples,   "Examples",   "examples");
   print_dependencies (pkg->benchmarks, "Benchmarks", "benchmarks");
 
-  bool builds (build_db_ != nullptr && pkg->buildable);
+  bool builds (build_db_ != nullptr &&
+               pkg->buildable == buildable_status::buildable);
 
   if (builds)
   {