tests: Fix execution of testrunner for out-of-source builds #510
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
Collaborator
|
We should also add an out-of-source build to the CI to make sure this does not break in the future. |
Contributor
Author
Collaborator
|
The out-of-source build should be a single additional step and not all of the builds. |
Collaborator
Let me re-phrase that - it should not affect all of the steps. This unnecessary taints the workflows. It is also enough to just test it for a single os and compiler (i.e. |
firewave
reviewed
Aug 27, 2025
firewave
reviewed
Aug 27, 2025
jcfr
force-pushed
the
fix-testrunner-out-of-source
branch
3 times, most recently
from
6a2a43d to
5a942c7
Compare
Contributor
Author
|
Et voila. All comments have been addressed:
|
hjmjohnson
approved these changes
Aug 28, 2025
This changes the testrunner configuration to correctly handle out-of-source builds by setting the SIMPLECPP_SOURCE_DIR definition. This ensures that the source directory is available to the test runner, allowing it to find include paths correctly.
The `SIMPLECPP_SOURCE_DIR` define was changed to `SIMPLECPP_TEST_SOURCE_DIR` to remove ambiguity about its purpose. This change clarifies that the variable is intended to be used in the context of testing. Suggested-by: Oliver Stöneberg <firewave@users.noreply.github.com>
This updates the GitHub Actions workflow to execute `testrunner` twice, but only for the CMake build case: - Once from the repository root (default case). - Once from within the `cmake.output` build directory to ensure the `SIMPLECPP_TEST_SOURCE_DIR` definition is correctly set and resolved. Note that this is not yet supported for the Makefile-based build. Suggested-by: Oliver Stöneberg <firewave@users.noreply.github.com>
This updates the Makefile so that `test.o` is compiled with `-DSIMPLECPP_TEST_SOURCE_DIR="$(CURDIR)"`, ensuring the test suite can locate headers and sources consistently with the CMake build.
jcfr
force-pushed
the
fix-testrunner-out-of-source
branch
from
5a942c7 to
49a8a16
Compare
firewave
reviewed
Aug 28, 2025
firewave
reviewed
Aug 28, 2025
Co-authored-by: Oliver Stöneberg <firewave@users.noreply.github.com>
jcfr
force-pushed
the
fix-testrunner-out-of-source
branch
from
49a8a16 to
d3b0ba1
Compare
This ensures that preprocessor flags are managed separately from compiler flags, avoiding confusion with user-provided CXXOPTS. Co-authored-by: Oliver Stöneberg <firewave@users.noreply.github.com>
firewave
approved these changes
Aug 28, 2025
danmar
approved these changes
Aug 29, 2025
Collaborator
|
Hey, that also fixes the test failures I was seeing locally since forever. I always attributed those to some EOL issues since they never reproduced anywhere else. |
|
Awesome! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
This pull request fixes the execution of the
testrunnerin out-of-source builds by setting theSIMPLECPP_SOURCE_DIRdefinition. This change ensures that the test runner can correctly find include paths by using the source directory.The
CMakeLists.txtfile is updated to defineSIMPLECPP_SOURCE_DIR, and the test cases intest.cppare modified to conditionally add this directory to the include paths ifdefined.