Merge branch 'master' of https://github.com/Microsoft/vcpkg into patch-vs2013

# Conflicts:
#	toolsrc/include/vcpkg/vcpkgpaths.h
#	toolsrc/src/vcpkg/vcpkgpaths.cpp

1 files changed, 0 insertions, 58 deletions

diff --git a/toolsrc/src/tests_arguments.cpp b/toolsrc/src/tests_arguments.cpp
deleted file mode 100644
index 14b3c3d4f..000000000
--- a/toolsrc/src/tests_arguments.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "CppUnitTest.h"

-#include "VcpkgCmdArguments.h"

-

-#pragma comment(lib, "version")

-#pragma comment(lib, "winhttp")

-

-using namespace Microsoft::VisualStudio::CppUnitTestFramework;

-

-using namespace vcpkg;

-

-namespace UnitTest1

-{

-    class ArgumentTests : public TestClass<ArgumentTests>

-    {

-        TEST_METHOD(create_from_arg_sequence_options_lower)

-        {

-            std::vector<std::string> t = {"--vcpkg-root", "C:\\vcpkg", "--debug", "--sendmetrics", "--printmetrics"};

-            auto v = VcpkgCmdArguments::create_from_arg_sequence(t.data(), t.data() + t.size());

-            Assert::AreEqual("C:\\vcpkg", v.vcpkg_root_dir.get()->c_str());

-            Assert::IsTrue(v.debug && *v.debug.get());

-            Assert::IsTrue(v.sendmetrics && v.sendmetrics.get());

-            Assert::IsTrue(v.printmetrics && *v.printmetrics.get());

-        }

-

-        TEST_METHOD(create_from_arg_sequence_options_upper)

-        {

-            std::vector<std::string> t = {"--VCPKG-ROOT", "C:\\vcpkg", "--DEBUG", "--SENDMETRICS", "--PRINTMETRICS"};

-            auto v = VcpkgCmdArguments::create_from_arg_sequence(t.data(), t.data() + t.size());

-            Assert::AreEqual("C:\\vcpkg", v.vcpkg_root_dir.get()->c_str());

-            Assert::IsTrue(v.debug && *v.debug.get());

-            Assert::IsTrue(v.sendmetrics && v.sendmetrics.get());

-            Assert::IsTrue(v.printmetrics && *v.printmetrics.get());

-        }

-

-        TEST_METHOD(create_from_arg_sequence_valued_options)

-        {

-            std::vector<std::string> t = {"--a=b", "command", "argument"};

-            auto v = VcpkgCmdArguments::create_from_arg_sequence(t.data(), t.data() + t.size());

-            auto opts = v.check_and_get_optional_command_arguments({}, {"--a"});

-            Assert::AreEqual("b", opts.settings["--a"].c_str());

-            Assert::AreEqual(size_t{1}, v.command_arguments.size());

-            Assert::AreEqual("argument", v.command_arguments[0].c_str());

-            Assert::AreEqual("command", v.command.c_str());

-        }

-

-        TEST_METHOD(create_from_arg_sequence_valued_options2)

-        {

-            std::vector<std::string> t = {"--a", "--b=c"};

-            auto v = VcpkgCmdArguments::create_from_arg_sequence(t.data(), t.data() + t.size());

-            auto opts = v.check_and_get_optional_command_arguments({"--a", "--c"}, {"--b", "--d"});

-            Assert::AreEqual("c", opts.settings["--b"].c_str());

-            Assert::IsTrue(opts.settings.find("--d") == opts.settings.end());

-            Assert::IsTrue(opts.switches.find("--a") != opts.switches.end());

-            Assert::IsTrue(opts.settings.find("--c") == opts.settings.end());

-            Assert::AreEqual(size_t{0}, v.command_arguments.size());

-        }

-    };

-}
\ No newline at end of file