Update TestSuiteBuilder.getLlvmTestSuiteSteps factory. #656
+105
−21
Conversation
This file contains hidden or 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
Added new optional arguments: * compiler_flags - common flags for C and C++ compilers. * linker_flags - common linker flags for all exe/module/shared configurations. * src_dir - source dir for the test suite source code (within prop:buildir). * obj_dir - build dir for the test suite (within prop:buildir). Added new output properties: * ts_srcdir * ts_objdir
slydiman
reviewed
Dec 5, 2025
| cxx_flags = compiler_flags | ||
| if "CMAKE_C_FLAGS" in cmake_definitions: | ||
| c_flags = util.Interpolate("%(kw:c_flags)s %(kw:flags)s", | ||
| c_flags = cflags, flags = cmake_definitions["CMAKE_C_FLAGS"]) |
Contributor
Author
There was a problem hiding this comment.
good catch, thank you. I'll update accordingly.
slydiman
reviewed
Dec 5, 2025
|
|
||
| path_suffix = src_dir or "llvm-test-suite") | ||
| test_suite_obj_dir = util.Interpolate("%(prop:builddir)s/%(kw:path_suffix)s", | ||
| path_suffix = obj_dir or util.Interpolate("%(prop:objdir:-build)s/llvm-test-suite")) |
Contributor
There was a problem hiding this comment.
What %(prop:objdir:-build)s means?
Contributor
Author
There was a problem hiding this comment.
It means - use a value of the 'objdir' property or the "build" string instead if 'objdir' is not defined. I.e. "build" is default value there.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Added new optional arguments:
Added new output properties:
The 'compiler_flags' argument extends or adds the following CMake configuration parameters to the appropriate step: CMAKE_C_FLAGS and CMAKE_CXX_FLAGS. The 'linker_flags' argument extends or adds the following CMake configuration parameters accordingly: CMAKE_EXE_LINKER_FLAGS, CMAKE_MODULE_LINKER_FLAGS and CMAKE_SHARED_LINKER_FLAGS.