meson: mctpd_test is only required for mctpd-enabled builds #104
+55
−19
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
jk-ozlabs
force-pushed
the
pr/meson-test-deps
branch
2 times, most recently
from
17cf054 to
bdc5a9f
Compare
If we're building without mctpd (ie, no libsystemd), then we won't have
a mctpd_test variable defined, so meson will fail:
meson.build:156:18: ERROR: Unknown variable "mctpd_test".
This builds the test dependencies according to what is enabled instead.
Fixes: CodeConstruct#102
Signed-off-by: Jeremy Kerr <[email protected]>
Shorten the PYTEST_FLAGS var name to keep the one-line script a little more manageable, no need for an export, and re-wrap. Signed-off-by: Jeremy Kerr <[email protected]>
We currently have one pytest invocation (through one meson test()) which runs all of the tests/test_*.py scripts. However, not all of those will be testable in any particular configuration. We may be building without libsystemd, in which case the test_mctpd.py and test_mctpd_endpoint.py tests will not work. So, define individual test() calls for each of the scripts. This also lets us modify the runtime environment (the mctp-only tests don't require dbus-run-session), and meson can parallelise too. Signed-off-by: Jeremy Kerr <[email protected]>
Add a build without libsystemd present, so we can catch any issues that arise from the non-mctpd build. Enable verbose test output while we're at it. Signed-off-by: Jeremy Kerr <[email protected]>
jk-ozlabs
force-pushed
the
pr/meson-test-deps
branch
from
bdc5a9f to
cc4b416
Compare
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.
If we're building without mctpd (ie, no libsystemd), then we won't have a mctpd_test variable defined, so meson will fail:
This builds the test dependencies according to what is enabled instead.
We then make the test-set conditional on the configuration too, by splitting into separate pytest invocations for the three test scripts (which are currently auto-loaded by pytest).
Finally, we add a github workflow for the no-libsystemd case to check this in future.
Fixes: #102