Add support for tests, examples, and benchmark package manifest values

7 files changed, 48 insertions, 19 deletions

diff --git a/tests/.gitignore b/tests/.gitignore
index e54525b..2e508a9 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1 +1,3 @@
 driver
+test/
+test-*/
diff --git a/tests/load/1/math/libfoo-1.2.4+1.tar.gz b/tests/load/1/math/libfoo-1.2.4+1.tar.gz
index 5d19fa6..74678eb 100644
--- a/tests/load/1/math/libfoo-1.2.4+1.tar.gz
+++ b/tests/load/1/math/libfoo-1.2.4+1.tar.gz
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
new file mode 100644
index 0000000..606893a
--- /dev/null
+++ b/tests/load/1/math/libfoo-benchmarks-1.2.4.tar.gz
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
new file mode 100644
index 0000000..c1d5fbd
--- /dev/null
+++ b/tests/load/1/math/libfoo-examples-1.2.4.tar.gz
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
new file mode 100644
index 0000000..8e5105f
--- /dev/null
+++ b/tests/load/1/math/libfoo-tests-1.2.4.tar.gz
diff --git a/tests/load/1/math/packages.manifest b/tests/load/1/math/packages.manifest
index 429e61f..de3b1c5 100644
--- a/tests/load/1/math/packages.manifest
+++ b/tests/load/1/math/packages.manifest
@@ -79,8 +79,35 @@ requires: linux | windows | macosx; Symbian support is coming.
 requires: c++11
 requires: ? ; libc++ standard library if using Clang on Mac OS X.
 requires: ? vc++ >= 12.0; Only if using VC++ on Windows.
+tests: libfoo-tests == 1.2.4
+examples: libfoo-examples
+benchmarks: libfoo-benchmarks > 0.0.1
 location: libfoo-1.2.4+1.tar.gz
-sha256sum: 533108c89724a80ba739168ec92540dff0b7d3660fa0771de780d8595ccff425
+sha256sum: c02b6033107387e05f48aa62ee6498152c967deb0e91a62f1e618fe9fd1bc644
+:
+name: libfoo-benchmarks
+version: 1.2.4
+summary: The Foo Math Library benchmarks
+license: MIT
+builds: none; Is only build to benchmark libfoo.
+location: libfoo-benchmarks-1.2.4.tar.gz
+sha256sum: 2ec3985a540ca5bf74786d0792820cfa8a2790964a5aeaba443dfa91f2a54c04
+:
+name: libfoo-examples
+version: 1.2.4
+summary: The Foo Math Library examples
+license: MIT
+builds: none; Is only built to demo libfoo usage.
+location: libfoo-examples-1.2.4.tar.gz
+sha256sum: 99658b9a5a5b834047b692b93ded9f9af3d255eb5ea3b27594f600b902039995
+:
+name: libfoo-tests
+version: 1.2.4
+summary: The Foo Math Library tests
+license: MIT
+builds: none; Is only built to test libfoo.
+location: libfoo-tests-1.2.4.tar.gz
+sha256sum: 16712c90df5ba2ffb920d29c9c25a29564f8ae01f167359c4651572789e6cd6c
 :
 name: libpq
 version: 0
diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx
index 6877f4b..d685c18 100644
--- a/tests/load/driver.cxx
+++ b/tests/load/driver.cxx
@@ -203,7 +203,7 @@ main (int argc, char* argv[])
 }
 
 static inline dependency
-dep (const char* n, optional<dependency_constraint> c)
+dep (const char* n, optional<version_constraint> c)
 {
   return dependency {package_name (n), move (c), nullptr};
 }
@@ -270,7 +270,7 @@ test_git_repos (const cstrings& loader_args,
 
     assert (p->dependencies[0][0] ==
             dep ("libmisc",
-                 dependency_constraint (
+                 version_constraint (
                    dep_ver ("1.0"), false, dep_ver ("1.0"), false)));
 
     assert (p->buildable);
@@ -311,7 +311,7 @@ test_pkg_repos (const cstrings& loader_args,
               query<repository>::id.tenant == tenant).size () == 7);
 
     assert (db.query<package> (
-              query<package>::id.tenant == tenant).size () == 18);
+              query<package>::id.tenant == tenant).size () == 21);
 
     shared_ptr<repository> sr (
       db.load<repository> (repository_id (tenant,
@@ -466,12 +466,12 @@ test_pkg_repos (const cstrings& loader_args,
 
     assert (fpv2->dependencies[0][0] ==
             dep ("libbar",
-                 dependency_constraint (
+                 version_constraint (
                    nullopt, true, dep_ver ("2.4.0"), false)));
 
     assert (fpv2->dependencies[1][0] ==
             dep ("libexp",
-                 dependency_constraint (
+                 version_constraint (
                    dep_ver ("+2-1.2"), false, dep_ver ("+2-1.2"), false)));
 
     assert (check_location (fpv2));
@@ -513,27 +513,27 @@ test_pkg_repos (const cstrings& loader_args,
 
     assert (fpv2a->dependencies[0][0] ==
             dep ("libmisc",
-                 dependency_constraint (
+                 version_constraint (
                    dep_ver ("0.1"), false, dep_ver ("2.0.0-"), true)));
 
     assert (fpv2a->dependencies[0][1] ==
             dep ("libmisc",
-                 dependency_constraint (
+                 version_constraint (
                    dep_ver ("2.0"), false, dep_ver ("5.0"), false)));
 
     assert (fpv2a->dependencies[1][0] ==
             dep ("libgenx",
-                 dependency_constraint (
+                 version_constraint (
                    dep_ver ("0.2"), true, dep_ver ("3.0"), true)));
 
     assert (fpv2a->dependencies[2][0] ==
             dep ("libexpat",
-                 dependency_constraint (
+                 version_constraint (
                    nullopt, true, dep_ver ("5.2"), true)));
 
     assert (fpv2a->dependencies[2][1] ==
             dep ("libexpat",
-                 dependency_constraint (
+                 version_constraint (
                    dep_ver ("1"), true, dep_ver ("5.1"), false)));
 
     assert (fpv2a->requirements.empty ());
@@ -573,7 +573,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv3->dependencies[0].size () == 1);
     assert (fpv3->dependencies[0][0] ==
             dep ("libmisc",
-                 dependency_constraint (
+                 version_constraint (
                    dep_ver ("2.0.0"), false, nullopt, true)));
 
     assert (check_location (fpv3));
@@ -612,7 +612,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv4->dependencies[0].size () == 1);
     assert (fpv4->dependencies[0][0] ==
             dep ("libmisc",
-                 dependency_constraint (
+                 version_constraint (
                    dep_ver ("2.0.0"), false, nullopt, true)));
 
     assert (check_location (fpv4));
@@ -696,7 +696,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (xpv->dependencies[0].size () == 1);
     assert (xpv->dependencies[0][0] ==
             dep ("libexpat",
-                 dependency_constraint (
+                 version_constraint (
                    dep_ver ("2.0.0"), false, nullopt, true)));
 
     assert (xpv->dependencies[1].size () == 1);
@@ -781,12 +781,12 @@ test_pkg_repos (const cstrings& loader_args,
 
     assert (fpv5->dependencies[0][0] ==
             dep ("libmisc",
-                 dependency_constraint (
+                 version_constraint (
                    nullopt, true, dep_ver ("1.1"), true)));
 
     assert (fpv5->dependencies[0][1] ==
             dep ("libmisc",
-                 dependency_constraint (
+                 version_constraint (
                    dep_ver ("2.3.0+0"), true, nullopt, true)));
 
     assert (fpv5->dependencies[1].size () == 1);
@@ -794,7 +794,7 @@ test_pkg_repos (const cstrings& loader_args,
 
     assert (fpv5->dependencies[1][0] ==
             dep ("libexp",
-                 dependency_constraint (
+                 version_constraint (
                    dep_ver ("1.0"), false, nullopt, true)));
 
     assert (fpv5->dependencies[2].size () == 2);
@@ -826,7 +826,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (check_location (fpv5));
 
     assert (fpv5->sha256sum && *fpv5->sha256sum ==
-            "533108c89724a80ba739168ec92540dff0b7d3660fa0771de780d8595ccff425");
+            "c02b6033107387e05f48aa62ee6498152c967deb0e91a62f1e618fe9fd1bc644");
 
     assert (fpv5->buildable);
 
@@ -866,7 +866,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (epv->dependencies[1].size () == 1);
     assert (epv->dependencies[1][0] ==
             dep ("libpq",
-                 dependency_constraint (
+                 version_constraint (
                    dep_ver ("9.0.0"), false, nullopt, true)));
 
     assert (epv->requirements.empty ());