diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-08-14 09:53:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-14 09:53:04 -0700 |
| commit | 0c2117845e1f2e3c260b74af8d60f315343b094e (patch) | |
| tree | 9a0e321a6a30a897803228f1d69d1936b7b3b039 /toolsrc/src/vcpkg-test/specifier.cpp | |
| parent | 2cdf1cad7aa9944a4c8edb90cb3656560c7b56d1 (diff) | |
| download | vcpkg-0c2117845e1f2e3c260b74af8d60f315343b094e.tar.gz vcpkg-0c2117845e1f2e3c260b74af8d60f315343b094e.zip | |
[vcpkg] Reduce dependencies and contents of vcpkgpaths.h (#12876)
* [vcpkg] Remove globally-constructed pre-defined Triplets from vcpkg.exe
The tool should be as triplet-agnostic as possible, which leaves little room for special, pre-defined names like this. However, tests do have use of them: moved into test assets.
* [vcpkg] Move predefined tools strings vcpkgpaths.h -> tools.h
* [vcpkg] Add forward declarations to vcpkgpaths.h to reduce header deps
* Merge from origin/master
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'toolsrc/src/vcpkg-test/specifier.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg-test/specifier.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/toolsrc/src/vcpkg-test/specifier.cpp b/toolsrc/src/vcpkg-test/specifier.cpp index f350ff601..f750f4144 100644 --- a/toolsrc/src/vcpkg-test/specifier.cpp +++ b/toolsrc/src/vcpkg-test/specifier.cpp @@ -5,6 +5,8 @@ #include <vcpkg/packagespec.h> +#include <vcpkg-test/util.h> + using namespace vcpkg; TEST_CASE ("specifier conversion", "[specifier]") @@ -13,8 +15,8 @@ TEST_CASE ("specifier conversion", "[specifier]") { constexpr std::size_t SPEC_SIZE = 6; - PackageSpec a_spec("a", Triplet::X64_WINDOWS); - PackageSpec b_spec("b", Triplet::X64_WINDOWS); + PackageSpec a_spec("a", Test::X64_WINDOWS); + PackageSpec b_spec("b", Test::X64_WINDOWS); auto fspecs = FullPackageSpec{a_spec, {"0", "1"}}.to_feature_specs({}, {}); auto fspecs2 = FullPackageSpec{b_spec, {"2", "3"}}.to_feature_specs({}, {}); @@ -94,19 +96,18 @@ TEST_CASE ("specifier parsing", "[specifier]") SECTION ("expand wildcards") { - auto zlib = vcpkg::FullPackageSpec::from_string("zlib[0,1]", Triplet::X86_UWP).value_or_exit(VCPKG_LINE_INFO); - auto openssl = - vcpkg::FullPackageSpec::from_string("openssl[*]", Triplet::X86_UWP).value_or_exit(VCPKG_LINE_INFO); + auto zlib = vcpkg::FullPackageSpec::from_string("zlib[0,1]", Test::X86_UWP).value_or_exit(VCPKG_LINE_INFO); + auto openssl = vcpkg::FullPackageSpec::from_string("openssl[*]", Test::X86_UWP).value_or_exit(VCPKG_LINE_INFO); auto specs = zlib.to_feature_specs({}, {}); auto specs2 = openssl.to_feature_specs({}, {}); Util::Vectors::append(&specs, specs2); Util::sort(specs); std::vector<FeatureSpec> spectargets{ - {{"openssl", Triplet::X86_UWP}, "core"}, - {{"zlib", Triplet::X86_UWP}, "core"}, - {{"zlib", Triplet::X86_UWP}, "0"}, - {{"zlib", Triplet::X86_UWP}, "1"}, + {{"openssl", Test::X86_UWP}, "core"}, + {{"zlib", Test::X86_UWP}, "core"}, + {{"zlib", Test::X86_UWP}, "0"}, + {{"zlib", Test::X86_UWP}, "1"}, }; Util::sort(spectargets); REQUIRE(specs.size() == spectargets.size()); |