diff options
| author | martin-s <webmaster@macside.net> | 2019-09-13 06:52:52 +0000 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-09-12 23:52:52 -0700 |
| commit | 191c864927ea9e9e8788408adda4eff35d3edaf1 (patch) | |
| tree | 3a801e402db45a41479199eaf027d02789b7cc9e /toolsrc/src/vcpkg-test/arguments.cpp | |
| parent | 0e23cd50fec3f5df9c84a18c9cc1f2bd4709ef71 (diff) | |
| download | vcpkg-191c864927ea9e9e8788408adda4eff35d3edaf1.tar.gz vcpkg-191c864927ea9e9e8788408adda4eff35d3edaf1.zip | |
Fix bug in `.vcpkg-root` detection that breaks `--overlay-triplets` (#7954)
* - Added scripts variable to ports file.
- Added check if triplet file is not available (NPE).
* - Fixed line endings.
* Provide location of .vcpkg-root to ports.cmake
* vcpkg sets VCPKG_ROOT_PATH in ports.cmake
* [vcpkg] Fail if VCPKG_ROOT_PATH is not passed from vcpkg.exe
* [vcpkg] Fix vcpkg rooth path
* [vcpkg] Make --x-scripts-root an experimental command
Diffstat (limited to 'toolsrc/src/vcpkg-test/arguments.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg-test/arguments.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/vcpkg-test/arguments.cpp b/toolsrc/src/vcpkg-test/arguments.cpp index 326b07579..c63a31396 100644 --- a/toolsrc/src/vcpkg-test/arguments.cpp +++ b/toolsrc/src/vcpkg-test/arguments.cpp @@ -13,7 +13,7 @@ TEST_CASE ("VcpkgCmdArguments from lowercase argument sequence", "[arguments]") { std::vector<std::string> t = {"--vcpkg-root", "C:\\vcpkg", - "--scripts-root=C:\\scripts", + "--x-scripts-root=C:\\scripts", "--debug", "--sendmetrics", "--printmetrics", @@ -45,7 +45,7 @@ TEST_CASE ("VcpkgCmdArguments from uppercase argument sequence", "[arguments]") { std::vector<std::string> t = {"--VCPKG-ROOT", "C:\\vcpkg", - "--SCRIPTS-ROOT=C:\\scripts", + "--X-SCRIPTS-ROOT=C:\\scripts", "--DEBUG", "--SENDMETRICS", "--PRINTMETRICS", |