diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-11 18:15:52 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-04-11 18:24:08 -0700 |
| commit | 7326b6c64dc6b04b6d8512f13dddf67bf7498bf1 (patch) | |
| tree | e6c095b1c26d0689730efe5f274bbeeb1090e57f /toolsrc/src/tests_paragraph.cpp | |
| parent | 0bc21296c9ef32412237a8cc0c8141d0226b9070 (diff) | |
| parent | 92c0a91d3fdd9a9df5d3feae611981ea170703f5 (diff) | |
| download | vcpkg-7326b6c64dc6b04b6d8512f13dddf67bf7498bf1.tar.gz vcpkg-7326b6c64dc6b04b6d8512f13dddf67bf7498bf1.zip | |
Merge from master
Diffstat (limited to 'toolsrc/src/tests_paragraph.cpp')
| -rw-r--r-- | toolsrc/src/tests_paragraph.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/src/tests_paragraph.cpp b/toolsrc/src/tests_paragraph.cpp index 10a84b703..58e4121a8 100644 --- a/toolsrc/src/tests_paragraph.cpp +++ b/toolsrc/src/tests_paragraph.cpp @@ -111,7 +111,7 @@ namespace UnitTest1 Assert::AreEqual("1.2.8", pgh.version.c_str()); Assert::AreEqual("", pgh.maintainer.c_str()); Assert::AreEqual("", pgh.description.c_str()); - Assert::AreEqual("x86-windows", pgh.spec.target_triplet().canonical_name().c_str()); + Assert::AreEqual("x86-windows", pgh.spec.triplet().canonical_name().c_str()); Assert::AreEqual(size_t(0), pgh.depends.size()); } @@ -363,7 +363,7 @@ namespace UnitTest1 vcpkg::Expected<vcpkg::PackageSpec> spec = vcpkg::PackageSpec::from_string("zlib", vcpkg::Triplet::X86_WINDOWS); Assert::AreEqual(vcpkg::PackageSpecParseResult::SUCCESS, vcpkg::to_package_spec_parse_result(spec.error_code())); Assert::AreEqual("zlib", spec.get()->name().c_str()); - Assert::AreEqual(vcpkg::Triplet::X86_WINDOWS.canonical_name(), spec.get()->target_triplet().canonical_name()); + Assert::AreEqual(vcpkg::Triplet::X86_WINDOWS.canonical_name(), spec.get()->triplet().canonical_name()); } TEST_METHOD(package_spec_parse_with_arch) @@ -371,7 +371,7 @@ namespace UnitTest1 vcpkg::Expected<vcpkg::PackageSpec> spec = vcpkg::PackageSpec::from_string("zlib:x64-uwp", vcpkg::Triplet::X86_WINDOWS); Assert::AreEqual(vcpkg::PackageSpecParseResult::SUCCESS, vcpkg::to_package_spec_parse_result(spec.error_code())); Assert::AreEqual("zlib", spec.get()->name().c_str()); - Assert::AreEqual(vcpkg::Triplet::X64_UWP.canonical_name(), spec.get()->target_triplet().canonical_name()); + Assert::AreEqual(vcpkg::Triplet::X64_UWP.canonical_name(), spec.get()->triplet().canonical_name()); } TEST_METHOD(package_spec_parse_with_multiple_colon) |