CI: restore integration tests, fixup MacOS/Windows expected linker parts #373
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
CI is showing that `-framework Security` is no longer produced by `cargo` with `--print native-static-libs`. This commit removes it from our expected output in the `verify_static_libs` test, and in the README.
These aren't mentioned in the README, so only the static lib verification test needs updating.
|
@jsha Would you be able to give this branch a quick review when you have a chance? 🙇 |
When we cut over to the Rust based integration tests we neglected to update the `make test` call-sites to also run `make integration`. The `test` PHONY target doesn't run the `--ignored` cargo tests that include the integration component. For the Windows makefile (not CMake) we must also update a test invocation to specify that cert verification should be skipped, otherwise the test just generates usage help. For the CMake windows targets, a few changes are needed: 1. We need to run the integration tests separately from the `TEST_COMMAND` - the test binaries are built by this process, and so we can't rely on them to exist for the integration test to use until afterwards 2. We need to run only the client/server tests. The CMake builds disagree with the non-CMake builds about the required linker parts for the `verify_static_libs` integration test.
cpu
force-pushed
the
cpu-integration-ci-restore
branch
from
e212c01 to
f8dac1d
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.
In #348 I neglected to update the callsites that were previously using
make testso they would run the new Rust-based integration tests (behindmake integration). It also seems like the Windows makefiletesttarget wasn't being exercised at all (there was a missing required env var for the client.exe invocation).This branch fixes that, and along the way uncovered that the MacOS and Windows linker parts have drifted from expected. Those are updated in this branch as well. Unfortunately it seems like the Windows CMake builds disagree on the linker parts compared to the Windows Makefile builds. For now I've made the CMake builds only run the client/server integration test, and let the Makefile builds enforce the expected linker parts. We could also consider maintaining two different
expected_linker_partsreturns, but doing that will be a bit tricky since right now the expected values are chosen bytarget_osalone, and don't know about the build tooling in-use.