diff options
| author | Jonathan Hale <Squareys@googlemail.com> | 2018-02-15 01:18:25 +0100 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-02-14 16:18:25 -0800 |
| commit | 425d07ef7f82541e50cc8cb1e2716fc33bba7b12 (patch) | |
| tree | e73f3675b5fe95f0dc61521a2a7457a6e5c08d53 /toolsrc/src/tests.utils.cpp | |
| parent | 50a545fcff4b3c922aa3ef5d0646dc9850f1bb86 (diff) | |
| download | vcpkg-425d07ef7f82541e50cc8cb1e2716fc33bba7b12.tar.gz vcpkg-425d07ef7f82541e50cc8cb1e2716fc33bba7b12.zip | |
[vcpkg] Implement Default-Features (#2697)
* [vcpkg] Add Default-Feature to make_status_pgh utility function
Signed-off-by: Squareys <squareys@googlemail.com>
* [vcpkg] Parse "Default-Features" as dependencies and add test for parsing
Signed-off-by: Squareys <squareys@googlemail.com>
* [vcpkg] Document some methods and structures
Signed-off-by: Squareys <squareys@googlemail.com>
* [vcpkg] Add install_default_features_test
Signed-off-by: Squareys <squareys@googlemail.com>
* [vcpkg] Change install_default_features_test to not have preinstalled package
* [vcpkg] Test install behaviour of default features
Signed-off-by: Squareys <squareys@googlemail.com>
* [vcpkg] Implement default features
Signed-off-by: Squareys <squareys@googlemail.com>
* [vcpkg] Test default features upgrade behavior
Signed-off-by: Squareys <squareys@googlemail.com>
* [vcpkg] Implement upgrade with default features
Signed-off-by: Squareys <squareys@googlemail.com>
* [vcpkg] Test behaviour of upgrade with default features in dependencies
Signed-off-by: Squareys <squareys@googlemail.com>
* [vcpkg] Make upgrade install new default features
Signed-off-by: Squareys <squareys@googlemail.com>
* [vcpkg] Move collecting of packages for which to prevent defaults
Further down the line to create_feature_install_plan.
Signed-off-by: Squareys <squareys@googlemail.com>
* [vcpkg] Fix core missing from default features and potential inf loop
Signed-off-by: Squareys <squareys@googlemail.com>
* [vcpkg] Rename, fix and move some tests
Signed-off-by: Squareys <squareys@googlemail.com>
Diffstat (limited to 'toolsrc/src/tests.utils.cpp')
| -rw-r--r-- | toolsrc/src/tests.utils.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/toolsrc/src/tests.utils.cpp b/toolsrc/src/tests.utils.cpp index 19e877920..a3d8ffc7d 100644 --- a/toolsrc/src/tests.utils.cpp +++ b/toolsrc/src/tests.utils.cpp @@ -35,7 +35,10 @@ namespace Microsoft::VisualStudio::CppUnitTestFramework std::wstring ToString(const vcpkg::PackageSpec& t) { return ToString(t.to_string()); } } -std::unique_ptr<StatusParagraph> make_status_pgh(const char* name, const char* depends, const char* triplet) +std::unique_ptr<StatusParagraph> make_status_pgh(const char* name, + const char* depends, + const char* default_features, + const char* triplet) { using Pgh = std::unordered_map<std::string, std::string>; return std::make_unique<StatusParagraph>(Pgh{{"Package", name}, @@ -43,6 +46,7 @@ std::unique_ptr<StatusParagraph> make_status_pgh(const char* name, const char* d {"Architecture", triplet}, {"Multi-Arch", "same"}, {"Depends", depends}, + {"Default-Features", default_features}, {"Status", "install ok installed"}}); } std::unique_ptr<StatusParagraph> make_status_feature_pgh(const char* name, |