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

Fix tests on FreeBSD x86 #3948

Merged
merged 8 commits into from
Oct 24, 2024
Merged

Fix tests on FreeBSD x86 #3948

merged 8 commits into from
Oct 24, 2024

Conversation

asomers
Copy link
Contributor

@asomers asomers commented Sep 28, 2024

This PR fixes the tests on FreeBSD 15 x86. Many of the symbols were wrong for all 32-bit architectures. All of these symbols are fairly obscure, so no real users are known to have encountered problems with them. The discrepancies were never caught because we do CI only on FreeBSD x86_64.

Note: this PR must be rebased after #3946 merges. That PR is much more important since it involves "struct stat", whereas this PR only concerns more obscure symbols.

@rustbot
Copy link
Collaborator

rustbot commented Sep 28, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@bors
Copy link
Contributor

bors commented Oct 1, 2024

☔ The latest upstream changes (presumably 4ce03da) made this pull request unmergeable. Please resolve the merge conflicts.

@asomers asomers marked this pull request as ready for review October 2, 2024 17:26
@asomers
Copy link
Contributor Author

asomers commented Oct 2, 2024

@tgross35 this is a follow up to the other PRs you've reviewed for me lately.

@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Oct 15, 2024
@tgross35
Copy link
Contributor

This looks fine at first glance. Could you add links to the relevant headers in the PR description? At least for the few variables that have different values per-arch.

The definition added in b811b70 was
technically wrong even though the type size was correct.  It was
probably defined this way because earlier versions of Rust had
difficulty with fixed-size arrays of size greater than 32.

This change is necessary for CI to pass on x86 FreeBSD.

https://github.com/freebsd/freebsd-src/blob/main/sys/x86/include/ucontext.h
It's always had the wrong size, but apparently never been tested on
32-bit FreeBSD.

In addition to fixing its size, it ought to be moved info freebsd/mod.rs
.  Otherwise it's pretty much inaccessible to everyone.

https://github.com/freebsd/freebsd-src/blob/main/sys/sys/_domainset.h
@asomers
Copy link
Contributor Author

asomers commented Oct 15, 2024

@tgross35 I added links to the header files in all of the commit messages and force-pushed.

Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the perfect commit history, I didn't look in detail but everything seems reasonable here.

@tgross35 tgross35 added this pull request to the merge queue Oct 24, 2024
Merged via the queue into rust-lang:main with commit b63bf71 Oct 24, 2024
41 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review stable-nominated This PR should be considered for cherry-pick to libc's stable release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants