New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix CMake.test() target for Ninja Multi-Config #11594
Merged
memsharded
merged 3 commits into
conan-io:develop
from
Naufragous:fix/cmake-test-with-ninja-multi-config
Jul 9, 2022
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
import pytest | ||
|
||
from conan.tools.cmake import CMake | ||
from conan.tools.cmake.presets import write_cmake_presets | ||
from conans.client.conf import get_default_settings_yml | ||
from conans.model.conf import Conf | ||
from conans.model.settings import Settings | ||
from conans.test.utils.mocks import ConanFileMock | ||
from conans.test.utils.test_files import temp_folder | ||
|
||
|
||
@pytest.mark.parametrize("generator,target", [ | ||
("NMake Makefiles", "test"), | ||
("Ninja Makefiles", "test"), | ||
("Ninja Multi-Config", "test"), | ||
("Unix Makefiles", "test"), | ||
("Visual Studio 14 2015", "RUN_TESTS"), | ||
("Xcode", "RUN_TESTS"), | ||
]) | ||
def test_run_tests(generator, target): | ||
""" | ||
Testing that the proper test target is picked for different generators, especially multi-config ones. | ||
Issue related: https://github.com/conan-io/conan/issues/11405 | ||
""" | ||
settings = Settings.loads(get_default_settings_yml()) | ||
settings.os = "Windows" | ||
settings.arch = "x86" | ||
settings.build_type = "Release" | ||
settings.compiler = "Visual Studio" | ||
settings.compiler.runtime = "MDd" | ||
settings.compiler.version = "14" | ||
|
||
conanfile = ConanFileMock() | ||
conanfile.conf = Conf() | ||
conanfile.folders.generators = "." | ||
conanfile.folders.set_base_generators(temp_folder()) | ||
conanfile.settings = settings | ||
|
||
write_cmake_presets(conanfile, "toolchain", generator, {}) | ||
cmake = CMake(conanfile) | ||
cmake.test() | ||
assert "'--target' '%s'" % target in conanfile.command | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a small difference atm in the command in Windows, the args are not quoted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cc/ @lasote This is one of the things related to #11553, that seems a bit weird to me, that the commands quoting is different in different systems.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the suggestion. I added the
platform
import and made the search pattern conditional on the platform.