aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/vcpkg-test
diff options
context:
space:
mode:
authorras0219 <533828+ras0219@users.noreply.github.com>2020-08-13 18:36:33 -0700
committerGitHub <noreply@github.com>2020-08-13 18:36:33 -0700
commit0b5bbe30d940c597242cefa899dc93168054e466 (patch)
treea02a36758c8d4f794194dd37b48a7649fc143ee3 /toolsrc/src/vcpkg-test
parent5bb91a9452c2155e8ccd69c88629af24507249d4 (diff)
downloadvcpkg-0b5bbe30d940c597242cefa899dc93168054e466.tar.gz
vcpkg-0b5bbe30d940c597242cefa899dc93168054e466.zip
[vcpkg] Lift `--x-json` to a global option, implement experimental `x-package-info` command (#12845)
* [vcpkg] Improve error reporting in vcpkg::Json * [vcpkg] Lift --x-json to a common option * [vcpkg] Address warnings-as-errors in VS2015 * [vcpkg] Remove unused local * [vcpkg] Extract vcpkg::Install::get_cmake_usage * [vcpkg] Implement vcpkg::serialize_ipv(ipv, paths) * [vcpkg] Implement x-package-info to enable tooling * [vcpkg] Fixup tests to respect new cli mode Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'toolsrc/src/vcpkg-test')
-rw-r--r--toolsrc/src/vcpkg-test/commands.cpp3
-rw-r--r--toolsrc/src/vcpkg-test/manifests.cpp6
-rw-r--r--toolsrc/src/vcpkg-test/strings.cpp4
-rw-r--r--toolsrc/src/vcpkg-test/system.cpp4
4 files changed, 15 insertions, 2 deletions
diff --git a/toolsrc/src/vcpkg-test/commands.cpp b/toolsrc/src/vcpkg-test/commands.cpp
index eeefa3098..2c3779877 100644
--- a/toolsrc/src/vcpkg-test/commands.cpp
+++ b/toolsrc/src/vcpkg-test/commands.cpp
@@ -24,7 +24,7 @@ TEST_CASE ("get_available_basic_commands works", "[commands]")
TEST_CASE ("get_available_paths_commands works", "[commands]")
{
auto commands_list = Commands::get_available_paths_commands();
- CHECK(commands_list.size() == 18);
+ CHECK(commands_list.size() == 19);
CHECK(Commands::find("/?", commands_list) != nullptr);
CHECK(Commands::find("help", commands_list) != nullptr);
@@ -42,6 +42,7 @@ TEST_CASE ("get_available_paths_commands works", "[commands]")
CHECK(Commands::find("fetch", commands_list) != nullptr);
CHECK(Commands::find("x-ci-clean", commands_list) != nullptr);
CHECK(Commands::find("x-history", commands_list) != nullptr);
+ CHECK(Commands::find("x-package-info", commands_list) != nullptr);
CHECK(Commands::find("x-vsinstances", commands_list) != nullptr);
CHECK(Commands::find("x-format-manifest", commands_list) != nullptr);
diff --git a/toolsrc/src/vcpkg-test/manifests.cpp b/toolsrc/src/vcpkg-test/manifests.cpp
index 9fc041a19..4b450b7be 100644
--- a/toolsrc/src/vcpkg-test/manifests.cpp
+++ b/toolsrc/src/vcpkg-test/manifests.cpp
@@ -8,6 +8,10 @@
#include <vcpkg-test/util.h>
+#if defined(_MSC_VER)
+#pragma warning(disable : 6237)
+#endif
+
using namespace vcpkg;
using namespace vcpkg::Paragraphs;
using namespace vcpkg::Test;
@@ -248,7 +252,7 @@ TEST_CASE ("Serialize all the ports", "[manifests]")
std::vector<std::string> args_list = {"x-format-manifest"};
auto& fs = Files::get_real_filesystem();
auto args = VcpkgCmdArguments::create_from_arg_sequence(args_list.data(), args_list.data() + args_list.size());
- auto paths = VcpkgPaths{fs, args};
+ VcpkgPaths paths{fs, args};
std::vector<SourceControlFile> scfs;
diff --git a/toolsrc/src/vcpkg-test/strings.cpp b/toolsrc/src/vcpkg-test/strings.cpp
index 95a6de2af..cc45365e6 100644
--- a/toolsrc/src/vcpkg-test/strings.cpp
+++ b/toolsrc/src/vcpkg-test/strings.cpp
@@ -8,6 +8,10 @@
#include <utility>
#include <vector>
+#if defined(_MSC_VER)
+#pragma warning(disable : 6237)
+#endif
+
TEST_CASE ("b32 encoding", "[strings]")
{
using u64 = uint64_t;
diff --git a/toolsrc/src/vcpkg-test/system.cpp b/toolsrc/src/vcpkg-test/system.cpp
index 015406358..dec7b5769 100644
--- a/toolsrc/src/vcpkg-test/system.cpp
+++ b/toolsrc/src/vcpkg-test/system.cpp
@@ -11,6 +11,10 @@
#include <string>
+#if defined(_MSC_VER)
+#pragma warning(disable : 6237)
+#endif
+
using vcpkg::nullopt;
using vcpkg::Optional;
using vcpkg::StringView;