From f3d3143aa67d1d038f5eee1103c2b783d54955c4 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 30 Nov 2018 13:28:04 +0300 Subject: Match build configuration names, targets and machine names as paths --- tests/load/1/math/libexp-+2-1.2+1.tar.gz | Bin 368 -> 388 bytes tests/load/1/math/packages.manifest | 6 +++--- tests/load/driver.cxx | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/load') diff --git a/tests/load/1/math/libexp-+2-1.2+1.tar.gz b/tests/load/1/math/libexp-+2-1.2+1.tar.gz index e8b9183..c49541c 100644 Binary files a/tests/load/1/math/libexp-+2-1.2+1.tar.gz and b/tests/load/1/math/libexp-+2-1.2+1.tar.gz differ diff --git a/tests/load/1/math/packages.manifest b/tests/load/1/math/packages.manifest index df3b083..31baa82 100644 --- a/tests/load/1/math/packages.manifest +++ b/tests/load/1/math/packages.manifest @@ -13,10 +13,10 @@ email: users@exp.example.com build-email: builds@exp.example.com depends: libmisc depends: libpq >= 9.0.0 -build-exclude: *; Only supported on Linux. -build-include: linux* +build-include: windows**d/x86_64** +build-exclude: **; Only supported on Windows. location: libexp-+2-1.2+1.tar.gz -sha256sum: 9449cb008ca8cc3b91fbe5c44ae87f0e10fd24ff453bb88cf4504dabe2068eb3 +sha256sum: 6dc3ef269d7f50af2c234c51407eb5622e7395af8bf50a5f75880688c064b79b : name: libfoo version: +0-X.Y diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx index 8a592d6..04e7368 100644 --- a/tests/load/driver.cxx +++ b/tests/load/driver.cxx @@ -829,12 +829,12 @@ test_pkg_repos (const cstrings& loader_args, assert ( epv->build_constraints == build_constraints ({ - build_constraint (true, "*", nullopt, "Only supported on Linux."), - build_constraint (false, "linux*", nullopt, "")})); + build_constraint (false, "windows**d", "x86_64**", ""), + build_constraint (true, "**", nullopt, "Only supported on Windows.")})); assert (check_location (epv)); assert (epv->sha256sum && *epv->sha256sum == - "9449cb008ca8cc3b91fbe5c44ae87f0e10fd24ff453bb88cf4504dabe2068eb3"); + "6dc3ef269d7f50af2c234c51407eb5622e7395af8bf50a5f75880688c064b79b"); // Verify libpq package version. // -- cgit v1.1