Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: fixup static lib assertion #307

Merged
merged 2 commits into from
Mar 23, 2023

Conversation

cpu
Copy link
Member

@cpu cpu commented Mar 23, 2023

Description

Fixing the remaining rustls-0.21.0 CI failure identified in a smoketest branch.

With these fixes attached to the smoketest branch in addition to the in-flight PRs we get a 🟢 build 🎉: https://github.com/cpu/rustls-ffi/actions/runs/4503112550

tests: clarify verify-static-lib output - 6137272

When the verify-static-libraries.py assertion fails the output with the actual vs expected results was all on one line, making it harder to visually diff.

This commit splits the output up across a few lines to make it easier to spot the difference.

tests: adjust expected native static libs. - af16029

It looks like the early duplicate legacy_stdio_definitions.lib has fallen away. This commit removes it from the expected string, leaving only one instance and fixing the test.

cpu added 2 commits March 23, 2023 12:50
When the `verify-static-libraries.py` assertion fails the output with
the actual vs expected results was all on one line, making it harder to
visually diff.

This commit splits the output up across a few lines to make it easier to
spot the difference.
It looks like the early duplicate `legacy_stdio_definitions.lib` has
fallen away. This commit removes it.
@cpu cpu mentioned this pull request Mar 23, 2023
5 tasks
@jsha jsha merged commit 0d5ac8b into rustls:rustls-0.21.0 Mar 23, 2023
@cpu cpu deleted the cpu-fixup-static-lib-test branch March 23, 2023 16:59
jsha pushed a commit that referenced this pull request Mar 29, 2023
* tests: clarify verify-static-lib output

When the `verify-static-libraries.py` assertion fails the output with
the actual vs expected results was all on one line, making it harder to
visually diff.

This commit splits the output up across a few lines to make it easier to
spot the difference.

* tests: adjust expected native static libs.

It looks like the early duplicate `legacy_stdio_definitions.lib` has
fallen away. This commit removes it.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants