Fix CMake.test() target for Ninja Multi-Config #11594
Merged
Conversation
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
|
|
|
I used the test_run_tests test case from conans/test/unittests/client/build/cmake_test.py as basis for this new test. Unfortunately there seem to be not that many tests for the new CMake tool. Please advise if something is off. |
memsharded
reviewed
Jul 8, 2022
| write_cmake_presets(conanfile, "toolchain", generator, {}) | ||
| cmake = CMake(conanfile) | ||
| cmake.test() | ||
| assert "'--target' '%s'" % target in conanfile.command |
There was a problem hiding this comment.
Suggested change
| assert "'--target' '%s'" % target in conanfile.command | |
| if platform.system() == "Windows": | |
| assert "--target %s" % target in conanfile.command | |
| else: | |
| assert "'--target' '%s'" % target in conanfile.command |
There is a small difference atm in the command in Windows, the args are not quoted.
There was a problem hiding this comment.
Thank you for the suggestion. I added the platform import and made the search pattern conditional on the platform.
memsharded
approved these changes
Jul 9, 2022
|
Merged, this will be released in 1.51. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changelog: Bugfix: Use correct build target in
CMake.test()for the Ninja Multi-Config generator.Docs: omit
Fixes #11405