diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-12-15 10:26:00 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 10:26:00 -0800 |
| commit | 815396fa4e9e99da7af7d8454859f6247af1ef81 (patch) | |
| tree | 44bf8846dbc971bf758e58e146349c1f9ee11cd4 /toolsrc/include | |
| parent | 2aaa67573085c24bcb4e224b87605d708d9a6377 (diff) | |
| download | vcpkg-815396fa4e9e99da7af7d8454859f6247af1ef81.tar.gz vcpkg-815396fa4e9e99da7af7d8454859f6247af1ef81.zip | |
[vcpkg] Refactor end-to-end tests (#15081)
* [vcpkg] Refactor end-to-end tests
* [vcpkg] Cherry-pick x-builtin-ports-root from #14999
* [vcpkg] Move create test from unit tests to e2e
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/vcpkgcmdarguments.h | 2 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/vcpkgpaths.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/toolsrc/include/vcpkg/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h index 16e433d63..f18f4843c 100644 --- a/toolsrc/include/vcpkg/vcpkgcmdarguments.h +++ b/toolsrc/include/vcpkg/vcpkgcmdarguments.h @@ -132,6 +132,8 @@ namespace vcpkg std::unique_ptr<std::string> packages_root_dir; constexpr static StringLiteral SCRIPTS_ROOT_DIR_ARG = "x-scripts-root"; std::unique_ptr<std::string> scripts_root_dir; + constexpr static StringLiteral BUILTIN_PORTS_ROOT_DIR_ARG = "x-builtin-ports-root"; + std::unique_ptr<std::string> builtin_ports_root_dir; constexpr static StringLiteral DEFAULT_VISUAL_STUDIO_PATH_ENV = "VCPKG_VISUAL_STUDIO_PATH"; std::unique_ptr<std::string> default_visual_studio_path; diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index 257ecf7bb..e71f28b0a 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -91,6 +91,7 @@ namespace vcpkg fs::path community_triplets; fs::path scripts; fs::path prefab; + fs::path builtin_ports; fs::path tools; fs::path buildsystems; @@ -142,7 +143,7 @@ namespace vcpkg // the directory of the builtin ports // this should be used only for helper commands, not core commands like `install`. - fs::path builtin_ports_directory() const { return root / fs::u8path("ports"); } + fs::path builtin_ports_directory() const { return this->builtin_ports; } private: std::unique_ptr<details::VcpkgPathsImpl> m_pimpl; |
