diff options
| author | Daniel Shaw <t-dansha@microsoft.com> | 2017-06-26 15:45:31 -0700 |
|---|---|---|
| committer | Daniel Shaw <t-dansha@microsoft.com> | 2017-06-26 15:52:18 -0700 |
| commit | cc06f978914917622904a0326094c1d5fba4118e (patch) | |
| tree | e3cd4ec34180e50ee2cc83f17b5e0e6ba4eb481d /toolsrc/src/test_install_plan.cpp | |
| parent | 838e8783d659456037c0e8e89dcc689e626b6816 (diff) | |
| download | vcpkg-cc06f978914917622904a0326094c1d5fba4118e.tar.gz vcpkg-cc06f978914917622904a0326094c1d5fba4118e.zip | |
Merge branch 'master' into create_install_tests
Diffstat (limited to 'toolsrc/src/test_install_plan.cpp')
| -rw-r--r-- | toolsrc/src/test_install_plan.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/toolsrc/src/test_install_plan.cpp b/toolsrc/src/test_install_plan.cpp index 90aaa532f..2404e30f7 100644 --- a/toolsrc/src/test_install_plan.cpp +++ b/toolsrc/src/test_install_plan.cpp @@ -19,9 +19,9 @@ namespace UnitTest1 Assert::IsTrue(m_pgh.has_value()); auto& scf = *m_pgh.get(); - auto spec = PackageSpec::from_name_and_triplet(scf.core_paragraph.name, Triplet::X86_WINDOWS); + auto spec = PackageSpec::from_name_and_triplet(scf->core_paragraph->name, Triplet::X86_WINDOWS); Assert::IsTrue(spec.has_value()); - map.emplace(*spec.get(), std::move(*m_pgh.get())); + map.emplace(*spec.get(), std::move(*scf.get())); return PackageSpec{*spec.get()}; }; @@ -49,9 +49,9 @@ namespace UnitTest1 Assert::IsTrue(m_pgh.has_value()); auto& scf = *m_pgh.get(); - auto spec = PackageSpec::from_name_and_triplet(scf.core_paragraph.name, Triplet::X86_WINDOWS); + auto spec = PackageSpec::from_name_and_triplet(scf->core_paragraph->name, Triplet::X86_WINDOWS); Assert::IsTrue(spec.has_value()); - map.emplace(*spec.get(), std::move(*m_pgh.get())); + map.emplace(*spec.get(), std::move(*scf.get())); return PackageSpec{*spec.get()}; }; @@ -103,13 +103,13 @@ namespace UnitTest1 {"Version", "1.2.8"}, {"Architecture", "x86-windows"}, {"Multi-Arch", "same"}, - {"Build-Depends", "k"}, + {"Depends", "k"}, {"Status", "install ok installed"}})); status_paragraphs.push_back(std::make_unique<StatusParagraph>(Pgh{{"Package", "k"}, {"Version", "1.2.8"}, {"Architecture", "x86-windows"}, {"Multi-Arch", "same"}, - {"Build-Depends", ""}, + {"Depends", ""}, {"Status", "install ok installed"}})); std::unordered_map<PackageSpec, SourceControlFile> map; @@ -118,9 +118,9 @@ namespace UnitTest1 Assert::IsTrue(m_pgh.has_value()); auto& scf = *m_pgh.get(); - auto spec = PackageSpec::from_name_and_triplet(scf.core_paragraph.name, Triplet::X86_WINDOWS); + auto spec = PackageSpec::from_name_and_triplet(scf->core_paragraph->name, Triplet::X86_WINDOWS); Assert::IsTrue(spec.has_value()); - map.emplace(*spec.get(), std::move(*m_pgh.get())); + map.emplace(*spec.get(), std::move(*scf.get())); return PackageSpec{*spec.get()}; }; |