From 28de3ed8416c20ab54527e5cc8a48c46de3bb9b5 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 6 Sep 2021 19:22:56 +0300 Subject: Add support for requires, tests, examples, benchmarks, and host task manifest values --- tests/load/1/math/libfoo-1.2.4+1.tar.gz | Bin 1032 -> 1033 bytes tests/load/1/math/packages.manifest | 3 ++- tests/load/driver.cxx | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'tests') 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 bafc657..80a6271 100644 Binary files a/tests/load/1/math/libfoo-1.2.4+1.tar.gz and b/tests/load/1/math/libfoo-1.2.4+1.tar.gz differ diff --git a/tests/load/1/math/packages.manifest b/tests/load/1/math/packages.manifest index 335b9d0..7ed9a7d 100644 --- a/tests/load/1/math/packages.manifest +++ b/tests/load/1/math/packages.manifest @@ -79,11 +79,12 @@ 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. +requires: host tests: * libfoo-tests == 1.2.4 examples: libfoo-examples benchmarks: libfoo-benchmarks > 0.0.1 location: libfoo-1.2.4+1.tar.gz -sha256sum: 042a9c1df1bf6fc61a47d864dceff3cb68640aa68490174c10f5baf813116fa5 +sha256sum: 6692a487e0908598e36bdeb9c25ed1e4a35bb99587dbc475807d314fa0719ac6 : name: libfoo-benchmarks version: 1.2.4 diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx index 7ebbc93..02ce68a 100644 --- a/tests/load/driver.cxx +++ b/tests/load/driver.cxx @@ -806,7 +806,7 @@ test_pkg_repos (const cstrings& loader_args, assert (fpv5->dependencies[2][1] == dep ("libexpat", nullopt)); requirements& fpvr5 (fpv5->requirements); - assert (fpvr5.size () == 4); + assert (fpvr5.size () == 5); assert (fpvr5[0] == req_alts ({"linux", "windows", "macosx"})); assert (!fpvr5[0].conditional); @@ -825,10 +825,12 @@ test_pkg_repos (const cstrings& loader_args, assert (fpvr5[3].conditional); assert (fpvr5[3].comment == "Only if using VC++ on Windows."); + assert (fpvr5[4][0] == "host"); + assert (check_location (fpv5)); assert (fpv5->sha256sum && *fpv5->sha256sum == - "042a9c1df1bf6fc61a47d864dceff3cb68640aa68490174c10f5baf813116fa5"); + "6692a487e0908598e36bdeb9c25ed1e4a35bb99587dbc475807d314fa0719ac6"); assert (fpv5->buildable); -- cgit v1.1