diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-06-21 23:50:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-21 23:50:05 -0700 |
| commit | f3db66b403840b24ea2612d09cca30a5285f5ea3 (patch) | |
| tree | eb3504205b87fa7ae5b7ccdba4820469c9e856c0 /toolsrc/src/tests.update.cpp | |
| parent | d1b4e88d3c1bd714069f10009c6f9cef172cc822 (diff) | |
| download | vcpkg-f3db66b403840b24ea2612d09cca30a5285f5ea3.tar.gz vcpkg-f3db66b403840b24ea2612d09cca30a5285f5ea3.zip | |
Ports Overlay partial implementation (#6981)
* Ports Overlay feature spec
* Ports Overlay implementation
* [--overlay-ports] Refactor handling of additional paths
* Code cleanup
* [--overlay-ports] Add help
* [depend-info] Support --overlay-ports
* Add method to load all ports using PathsPortFileProvider
* Make PortFileProvider::load_all_control_files() const
* Remove unused code
* [vcpkg] Avoid double-load of source control file between Build::perform_and_exit and Build::perform_and_exit_ex
* [vcpkg] Clang format
* [vcpkg] Fixup build failure introduced in b069ceb2f231
* Report errors from Paragraphs::try_load_port()
Diffstat (limited to 'toolsrc/src/tests.update.cpp')
| -rw-r--r-- | toolsrc/src/tests.update.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/toolsrc/src/tests.update.cpp b/toolsrc/src/tests.update.cpp index b6e487c17..5e3f9f3e2 100644 --- a/toolsrc/src/tests.update.cpp +++ b/toolsrc/src/tests.update.cpp @@ -21,9 +21,9 @@ namespace UnitTest1 StatusParagraphs status_db(std::move(status_paragraphs)); - std::unordered_map<std::string, SourceControlFile> map; + std::unordered_map<std::string, SourceControlFileLocation> map; auto scf = unwrap(SourceControlFile::parse_control_file(Pgh{{{"Source", "a"}, {"Version", "0"}}})); - map.emplace("a", std::move(*scf)); + map.emplace("a", SourceControlFileLocation { std::move(scf), "" }); Dependencies::MapPortFileProvider provider(map); auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(provider, status_db), @@ -45,9 +45,9 @@ namespace UnitTest1 StatusParagraphs status_db(std::move(status_paragraphs)); - std::unordered_map<std::string, SourceControlFile> map; + std::unordered_map<std::string, SourceControlFileLocation> map; auto scf = unwrap(SourceControlFile::parse_control_file(Pgh{{{"Source", "a"}, {"Version", "0"}}})); - map.emplace("a", std::move(*scf)); + map.emplace("a", SourceControlFileLocation { std::move(scf), "" }); Dependencies::MapPortFileProvider provider(map); auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(provider, status_db), @@ -71,9 +71,9 @@ namespace UnitTest1 StatusParagraphs status_db(std::move(status_paragraphs)); - std::unordered_map<std::string, SourceControlFile> map; + std::unordered_map<std::string, SourceControlFileLocation> map; auto scf = unwrap(SourceControlFile::parse_control_file(Pgh{{{"Source", "a"}, {"Version", "0"}}})); - map.emplace("a", std::move(*scf)); + map.emplace("a", SourceControlFileLocation{ std::move(scf), "" }); Dependencies::MapPortFileProvider provider(map); auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(provider, status_db), @@ -92,9 +92,9 @@ namespace UnitTest1 StatusParagraphs status_db(std::move(status_paragraphs)); - std::unordered_map<std::string, SourceControlFile> map; + std::unordered_map<std::string, SourceControlFileLocation> map; auto scf = unwrap(SourceControlFile::parse_control_file(Pgh{{{"Source", "a"}, {"Version", "2"}}})); - map.emplace("a", std::move(*scf)); + map.emplace("a", SourceControlFileLocation{ std::move(scf), "" }); Dependencies::MapPortFileProvider provider(map); auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(provider, status_db), |