From e9f2b8c235d42b2232b7ae1b8b321e9e68690c33 Mon Sep 17 00:00:00 2001 From: SSE4 Date: Sun, 13 Jan 2019 12:07:41 +0700 Subject: [PATCH] - add test for CMake helper and MSBuild verbosity Signed-off-by: SSE4 --- conans/client/build/cmake.py | 2 +- .../test/unittests/client/build/cmake_test.py | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/conans/client/build/cmake.py b/conans/client/build/cmake.py index a2473a85afe..3b019582a05 100644 --- a/conans/client/build/cmake.py +++ b/conans/client/build/cmake.py @@ -223,7 +223,7 @@ def _build(self, args=None, build_dir=None, target=None): compiler_version and Version(compiler_version) >= "10": if "--" not in args: args.append("--") - args.append("/verbosity:%s" % self.msbuild_verbosity) + args.append("/verbosity:%s" % self.msbuild_verbosity) arg_list = join_arguments([ args_to_string([build_dir]), diff --git a/conans/test/unittests/client/build/cmake_test.py b/conans/test/unittests/client/build/cmake_test.py index f2ff1b0c43d..591c364ba0c 100644 --- a/conans/test/unittests/client/build/cmake_test.py +++ b/conans/test/unittests/client/build/cmake_test.py @@ -1160,3 +1160,28 @@ def test_vcvars_applied(self, generator, compiler, version): vcvars_mock.__exit__ = mock.MagicMock(return_value=None) cmake.build() self.assertTrue(vcvars_mock.called, "vcvars weren't called") + + def test_msbuild_verbosity(self): + settings = Settings.loads(default_settings_yml) + settings.os = "Windows" + settings.compiler = "Visual Studio" + settings.compiler.version = "10" + settings.compiler.runtime = "MDd" + settings.arch = "x86" + settings.build_type = None + + conan_file = ConanFileMock() + conan_file.settings = settings + + cmake = CMake(conan_file) + cmake.build() + self.assertIn("/verbosity:minimal", conan_file.command) + + cmake = CMake(conan_file, msbuild_verbosity="quiet") + cmake.build() + self.assertIn("/verbosity:quiet", conan_file.command) + + with tools.environment_append({"CONAN_MSBUILD_VERBOSITY": "detailed"}): + cmake = CMake(conan_file) + cmake.build() + self.assertIn("/verbosity:detailed", conan_file.command)