Skip to content

Conversation

mcpherrinm
Copy link
Contributor

This is an alternate version of #1614 that attempts to fix issues with the android ctests by rearranging the headers. Due to long CI cycle time, I've opened it as an alternate PR. Only one or the other should merge, depending if linux_like or linux is the correct place for this.

sock_extended_err is a struct returned as a control message when the sockopt
IP_RECVERR is set, when recvmsg has the MSG_ERRQUEUE flag set. IP_RECVERR and
MSG_ERRQUEUE are constants both already defined here.

This moves the linux/ headers after others
This keeps the Android tests closer to the Linux ones.
I think this is needed to get linux/errqueue.h to not cause compilation
failures.
sock_extended_err is a struct returned as a control message when the sockopt
IP_RECVERR is set, when recvmsg has the MSG_ERRQUEUE flag set.  IP_RECVERR and
MSG_ERRQUEUE are constants both already defined here.
@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @gnzlbg (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@mcpherrinm
Copy link
Contributor Author

CI failure was in:
The command '/bin/sh -c curl --retry 5 -L https://downloads.openwrt.org/releases/19.07.0-rc1/targets/ar71xx/generic/openwrt-sdk-19.07.0-rc1-ar71xx-generic_gcc-7.4.0_musl.Linux-x86_64.tar.xz | tar xJf - -C /toolchain --strip-components=1' returned a non-zero code: 2

Can we re-run that assuming it was an intermittent outage/error?

Modelled after the cmsg tests, this wraps the C macro into a function, and then
compares the results to the Rust implementation in libc.
@mcpherrinm
Copy link
Contributor Author

Actually, I just force-pushed to make CI re-run

@mcpherrinm
Copy link
Contributor Author

@gnzlbg I added a test per the other PR. Anything else I need here?

@mcpherrinm
Copy link
Contributor Author

Hi, anything I can do to get this merged?

@gnzlbg
Copy link
Contributor

gnzlbg commented Dec 23, 2019

@bors: r+

@bors
Copy link
Contributor

bors commented Dec 23, 2019

📌 Commit 06938ad has been approved by gnzlbg

@bors
Copy link
Contributor

bors commented Dec 23, 2019

⌛ Testing commit 06938ad with merge a3c5f9b...

bors added a commit that referenced this pull request Dec 23, 2019
Add sock_extended_err and associated constants from errqueue.h to linux_like

This is an alternate version of #1614 that attempts to fix issues with the android ctests by rearranging the headers.  Due to long CI cycle time, I've opened it as an alternate PR.  Only one or the other should merge, depending if linux_like or linux is the correct place for this.

sock_extended_err is a struct returned as a control message when the sockopt
IP_RECVERR is set, when recvmsg has the MSG_ERRQUEUE flag set. IP_RECVERR and
MSG_ERRQUEUE are constants both already defined here.
@bors
Copy link
Contributor

bors commented Dec 23, 2019

☀️ Test successful - checks-cirrus-freebsd-10, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, status-azure
Approved by: gnzlbg
Pushing a3c5f9b to master...

@bors bors merged commit 06938ad into rust-lang:master Dec 23, 2019
@mcpherrinm mcpherrinm deleted the withandroid branch December 23, 2019 13:47
@mcpherrinm
Copy link
Contributor Author

thank you!

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.

4 participants