[develop2] Fixing issues with test_package output folder #12992
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
1 task
AbrilRBS
approved these changes
Jan 30, 2023
| @@ -51,8 +51,12 @@ def cmake_layout(conanfile, generator=None, src_folder=".", build_folder="build" | |||
|
|
|||
| def get_build_folder_custom_vars(conanfile): | |||
|
|
|||
| build_vars = conanfile.conf.get("tools.cmake.cmake_layout:build_folder_vars", | |||
| default=[], check_type=list) | |||
| if conanfile.tested_reference_str: | |||
There was a problem hiding this comment.
After your explanation I quite like this. My only gripe would be that as far as I can see, we have now lost the test_output bit in the path, so it'd be harder to gitignore these folders now.
May be worth re-adding them before merging (Or if it's still there, please point me to the code that does that as I must have missed it!)
There was a problem hiding this comment.
This is a cmake_layout, the base folder name is already an argument to the function (default "build"), so that will still be present, is the same default name that must be ignored for local builds (conan install .) too.
| @@ -41,7 +41,7 @@ def cmake_layout(conanfile, generator=None, src_folder=".", build_folder="build" | |||
|
|
|||
| conanfile.cpp.source.includedirs = ["include"] | |||
|
|
|||
| if multi and not user_defined_build: | |||
| if multi: | |||
franramirez688
approved these changes
Jan 31, 2023
3 tasks
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: Fix: Fixing issues with test_package output folder.
New proposal to deal with the
test_packageissues:test_outputfoldertest_packagecan remove thebuild_folderif it is different than thesource_folder, and it will remove it before reusingtest_packagedefines a new, more complete folder name likegcc10x86release14staticto avoid collisions.TODOs:
build_folder_varsincmake_layout()directly