diff options
| author | n-salim <53019816+n-salim@users.noreply.github.com> | 2019-08-22 18:32:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-22 18:32:24 -0700 |
| commit | 76f17219c71973fd4a58f2f8020eec4d8f5dcd11 (patch) | |
| tree | a79752b1baa76e96d78e7a59f1d3dc9cc67160e1 /src/libstd | |
| parent | b37d1073f6890d8b4fd38f1d6bb64143ec2f591a (diff) | |
| parent | f5b1b1cdf9d8c893530599924f1a9f4564e28d98 (diff) | |
| download | rust-76f17219c71973fd4a58f2f8020eec4d8f5dcd11.tar.gz rust-76f17219c71973fd4a58f2f8020eec4d8f5dcd11.zip | |
Merge pull request #7 from Wind-River/vxworks-V7LIBC-942
Skip socket timeout tests on VxWorks
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(); |