From 65ba2b47c8d6c83e37fe772a7b54fd6b7480ce17 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 1 Apr 2020 23:01:02 +0300
Subject: Add support for test-exclude task manifest value

Note that the last two commits demonstrate an approach to use for migrating
data on the ODB object member type change.
---
 tests/load/1/math/libfoo-benchmarks-1.2.4.tar.gz | Bin 262 -> 264 bytes
 tests/load/1/math/libfoo-examples-1.2.4.tar.gz   | Bin 268 -> 263 bytes
 tests/load/1/math/libfoo-tests-1.2.4.tar.gz      | Bin 259 -> 260 bytes
 tests/load/1/math/packages.manifest              |  12 ++++++------
 tests/load/driver.cxx                            |  12 ++++++------
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'tests')

diff --git a/tests/load/1/math/libfoo-benchmarks-1.2.4.tar.gz b/tests/load/1/math/libfoo-benchmarks-1.2.4.tar.gz
index 606893a..391eb6f 100644
Binary files a/tests/load/1/math/libfoo-benchmarks-1.2.4.tar.gz and b/tests/load/1/math/libfoo-benchmarks-1.2.4.tar.gz differ
diff --git a/tests/load/1/math/libfoo-examples-1.2.4.tar.gz b/tests/load/1/math/libfoo-examples-1.2.4.tar.gz
index c1d5fbd..eac5190 100644
Binary files a/tests/load/1/math/libfoo-examples-1.2.4.tar.gz and b/tests/load/1/math/libfoo-examples-1.2.4.tar.gz differ
diff --git a/tests/load/1/math/libfoo-tests-1.2.4.tar.gz b/tests/load/1/math/libfoo-tests-1.2.4.tar.gz
index 8e5105f..223e24d 100644
Binary files a/tests/load/1/math/libfoo-tests-1.2.4.tar.gz and b/tests/load/1/math/libfoo-tests-1.2.4.tar.gz differ
diff --git a/tests/load/1/math/packages.manifest b/tests/load/1/math/packages.manifest
index de3b1c5..ea37e2a 100644
--- a/tests/load/1/math/packages.manifest
+++ b/tests/load/1/math/packages.manifest
@@ -89,25 +89,25 @@ name: libfoo-benchmarks
 version: 1.2.4
 summary: The Foo Math Library benchmarks
 license: MIT
-builds: none; Is only build to benchmark libfoo.
+builds: 64; Fails building for 32 bits.
 location: libfoo-benchmarks-1.2.4.tar.gz
-sha256sum: 2ec3985a540ca5bf74786d0792820cfa8a2790964a5aeaba443dfa91f2a54c04
+sha256sum: ba664343db5b9bd574450175834b0dd39d038dcff7387477b6eff0d5783a8ac4
 :
 name: libfoo-examples
 version: 1.2.4
 summary: The Foo Math Library examples
 license: MIT
-builds: none; Is only built to demo libfoo usage.
+builds: 64; Fails building for 32 bits.
 location: libfoo-examples-1.2.4.tar.gz
-sha256sum: 99658b9a5a5b834047b692b93ded9f9af3d255eb5ea3b27594f600b902039995
+sha256sum: 1343d1826c3ae5446ad965bc9aa7b1586e4238c7736c344e63a4a6bae3d57a88
 :
 name: libfoo-tests
 version: 1.2.4
 summary: The Foo Math Library tests
 license: MIT
-builds: none; Is only built to test libfoo.
+builds: 64; Fails building for 32 bits.
 location: libfoo-tests-1.2.4.tar.gz
-sha256sum: 16712c90df5ba2ffb920d29c9c25a29564f8ae01f167359c4651572789e6cd6c
+sha256sum: c5c0520b4e612fa2f8948c42824f3e199926c2395bf2c2f898e83f9eb19261a4
 :
 name: libpq
 version: 0
diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx
index 420c1e3..728ab0c 100644
--- a/tests/load/driver.cxx
+++ b/tests/load/driver.cxx
@@ -272,7 +272,7 @@ test_git_repos (const cstrings& loader_args,
                  version_constraint (
                    dep_ver ("1.0"), false, dep_ver ("1.0"), false)));
 
-    assert (p->buildable);
+    assert (p->buildable == buildable_status::buildable);
 
     t.commit ();
   }
@@ -397,7 +397,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpvxy->sha256sum && *fpvxy->sha256sum ==
             "c994fd49f051ab7fb25f3a4e68ca878e484c5d3c2cb132b37d41224b0621b618");
 
-    assert (fpvxy->buildable);
+    assert (fpvxy->buildable == buildable_status::buildable);
 
     // libfoo-1.0
     //
@@ -433,7 +433,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv1->sha256sum && *fpv1->sha256sum ==
             "e89c6d746f8b1ea3ec58d294946d2f683d133438d2ac8c88549ba24c19627e76");
 
-    assert (fpv1->buildable);
+    assert (fpv1->buildable == buildable_status::buildable);
 
     // libfoo-1.2.2
     //
@@ -708,7 +708,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (xpv->sha256sum && *xpv->sha256sum ==
             "1833906dd93ccc0cda832d6a1b3ef9ed7877bb9958b46d9b2666033d4a7919c9");
 
-    assert (xpv->buildable);
+    assert (xpv->buildable == buildable_status::buildable);
 
     // Verify libfoo package versions.
     //
@@ -827,7 +827,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv5->sha256sum && *fpv5->sha256sum ==
             "c02b6033107387e05f48aa62ee6498152c967deb0e91a62f1e618fe9fd1bc644");
 
-    assert (fpv5->buildable);
+    assert (fpv5->buildable == buildable_status::buildable);
 
     // Verify libexp package version.
     //
@@ -870,7 +870,7 @@ test_pkg_repos (const cstrings& loader_args,
 
     assert (epv->requirements.empty ());
 
-    assert (epv->buildable);
+    assert (epv->buildable == buildable_status::buildable);
 
     db.load (*epv, epv->build_section);
 
-- 
cgit v1.1