diff options
| author | bors <bors@rust-lang.org> | 2019-09-06 20:49:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-06 20:49:20 +0000 |
| commit | da13f06ea0dc368f1350bfc356b7f81a838defde (patch) | |
| tree | c26194ffc7711c1b60f812f8a148ca8d121ba2f9 /src/libstd | |
| parent | 6e19f3f383b99414490243665c96b9f4e0f313f9 (diff) | |
| parent | 414d1047291348b5b8bf49e1d76fec978238d89f (diff) | |
| download | rust-da13f06ea0dc368f1350bfc356b7f81a838defde.tar.gz rust-da13f06ea0dc368f1350bfc356b7f81a838defde.zip | |
Auto merge of #63789 - Wind-River:master, r=alexcrichton
Support both static and dynamic linking mode in testing for vxWorks 1. Support both static and dynamic linking mode in testing for vxWorks 2. Ignore unsupported test cases: net:tcp:tests:timeouts and net:ucp:tests:timeouts r? @alexcrichton
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/net/tcp.rs | 3 | ||||
| -rw-r--r-- | src/libstd/net/udp.rs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs index cdffa390223..d8b6fb6da93 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs @@ -1597,7 +1597,8 @@ mod tests { // FIXME: re-enabled openbsd tests once their socket timeout code // no longer has rounding errors. - #[cfg_attr(any(target_os = "netbsd", target_os = "openbsd"), ignore)] + // VxWorks ignores SO_SNDTIMEO. + #[cfg_attr(any(target_os = "netbsd", target_os = "openbsd", target_os = "vxworks"), ignore)] #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31 #[test] fn timeouts() { diff --git a/src/libstd/net/udp.rs b/src/libstd/net/udp.rs index c430e103951..a5e7cd992f2 100644 --- a/src/libstd/net/udp.rs +++ b/src/libstd/net/udp.rs @@ -1026,7 +1026,8 @@ mod tests { // FIXME: re-enabled openbsd/netbsd tests once their socket timeout code // no longer has rounding errors. - #[cfg_attr(any(target_os = "netbsd", target_os = "openbsd"), ignore)] + // VxWorks ignores SO_SNDTIMEO. + #[cfg_attr(any(target_os = "netbsd", target_os = "openbsd", target_os = "vxworks"), ignore)] #[test] fn timeouts() { let addr = next_test_ip4(); |