android: stop skipping ioctl in tests - #5384
Merged
Merged
Conversation
Remove skip for `ioctl` and add `#define` for the macro required to get this symbol's overload not to be exposed [^1]. This should allow there to be only a single function signature against which to match. [^1]: <https://cs.android.com/android/platform/superproject/+/android-latest-release:bionic/libc/include/bits/ioctl.h;l=45;drc=f769f7ed768d2f691e77e9605f2a1f57f414ba6e>
rustbot
added
S-waiting-on-review
stable-nominated
tgross35
approved these changes
Aug 9, 2026
Member
There was a problem hiding this comment.
Cc @maurer but I don't expect this to be problematic, the linked header documents this define as a way to get rid of the override. So LGTM
tgross35
pushed a commit
to tgross35/rust-libc
that referenced
this pull request
Aug 31, 2026
Remove skip for `ioctl` and add `#define` for the macro required to get this symbol's overload not to be exposed [^1]. This should allow there to be only a single function signature against which to match. [^1]: <https://cs.android.com/android/platform/superproject/+/android-latest-release:bionic/libc/include/bits/ioctl.h;l=45;drc=f769f7ed768d2f691e77e9605f2a1f57f414ba6e> (backport <rust-lang#5384>) (cherry picked from commit 60e7684)
tgross35
pushed a commit
to tgross35/rust-libc
that referenced
this pull request
Aug 31, 2026
Remove skip for `ioctl` and add `#define` for the macro required to get this symbol's overload not to be exposed [^1]. This should allow there to be only a single function signature against which to match. [^1]: <https://cs.android.com/android/platform/superproject/+/android-latest-release:bionic/libc/include/bits/ioctl.h;l=45;drc=f769f7ed768d2f691e77e9605f2a1f57f414ba6e> (backport <rust-lang#5384>) (cherry picked from commit 60e7684)
tgross35
pushed a commit
to tgross35/rust-libc
that referenced
this pull request
Aug 31, 2026
Remove skip for `ioctl` and add `#define` for the macro required to get this symbol's overload not to be exposed [^1]. This should allow there to be only a single function signature against which to match. [^1]: <https://cs.android.com/android/platform/superproject/+/android-latest-release:bionic/libc/include/bits/ioctl.h;l=45;drc=f769f7ed768d2f691e77e9605f2a1f57f414ba6e> (backport <rust-lang#5384>) (cherry picked from commit 60e7684)
tgross35
pushed a commit
to tgross35/rust-libc
that referenced
this pull request
Aug 31, 2026
Remove skip for `ioctl` and add `#define` for the macro required to get this symbol's overload not to be exposed [^1]. This should allow there to be only a single function signature against which to match. [^1]: <https://cs.android.com/android/platform/superproject/+/android-latest-release:bionic/libc/include/bits/ioctl.h;l=45;drc=f769f7ed768d2f691e77e9605f2a1f57f414ba6e> (backport <rust-lang#5384>) (cherry picked from commit 60e7684)
tgross35
pushed a commit
to tgross35/rust-libc
that referenced
this pull request
Aug 31, 2026
Remove skip for `ioctl` and add `#define` for the macro required to get this symbol's overload not to be exposed [^1]. This should allow there to be only a single function signature against which to match. [^1]: <https://cs.android.com/android/platform/superproject/+/android-latest-release:bionic/libc/include/bits/ioctl.h;l=45;drc=f769f7ed768d2f691e77e9605f2a1f57f414ba6e> (backport <rust-lang#5384>) (cherry picked from commit 60e7684)
Merged
tgross35
added
stable-applied
tgross35
pushed a commit
to dybucc/libc
that referenced
this pull request
Aug 31, 2026
Remove skip for `ioctl` and add `#define` for the macro required to get this symbol's overload not to be exposed [^1]. This should allow there to be only a single function signature against which to match. [^1]: <https://cs.android.com/android/platform/superproject/+/android-latest-release:bionic/libc/include/bits/ioctl.h;l=45;drc=f769f7ed768d2f691e77e9605f2a1f57f414ba6e> (backport <rust-lang#5384>) (cherry picked from commit 60e7684)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Description
Removes a skip in ctest for
ioctlin Android targets. This was previously notpossible because there were issues with an overload exposed in Bionic libc. This
overload, though, is only conditionally exposed.
The macro used to skip the definition upstream has been added to the
#definesthat we have set up in
test_androidin libc-test's build script.Checklist
libc-test/semverhave been updated*LASTor*MAXhave the standarddoc comment
cargo test -p libc-test --target mytarget);especially relevant for platforms that may not be checked in CI
@rustbot label +stable-nominated