diff options
author | Andrew Walbran <qwandor@google.com> | 2020-09-29 12:32:53 +0100 |
---|---|---|
committer | Andrew Walbran <qwandor@google.com> | 2020-10-04 20:29:03 +0100 |
commit | c5739567a36fd37190743a49c3027616ce3d79a7 (patch) | |
tree | 07ec14d6ec31eae19765c2f76fc2f21fc2a30e03 /test/sys | |
parent | 7e46b95057b0d8e391c3fb72fdec08f3a4689631 (diff) | |
download | nix-c5739567a36fd37190743a49c3027616ce3d79a7.zip |
Support vsock on Android as well as Linux.
Fix deprecation warning from libc update.
Diffstat (limited to 'test/sys')
-rw-r--r-- | test/sys/test_socket.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/sys/test_socket.rs b/test/sys/test_socket.rs index a5fa54bd..1003598e 100644 --- a/test/sys/test_socket.rs +++ b/test/sys/test_socket.rs @@ -1411,7 +1411,7 @@ pub fn test_recv_ipv6pktinfo() { } } -#[cfg(target_os = "linux")] +#[cfg(any(target_os = "android", target_os = "linux"))] #[test] pub fn test_vsock() { use libc; @@ -1428,13 +1428,13 @@ pub fn test_vsock() { SockFlag::empty(), None) .expect("socket failed"); - // VMADDR_CID_HYPERVISOR and VMADDR_CID_RESERVED are reserved, so we expect + // VMADDR_CID_HYPERVISOR and VMADDR_CID_LOCAL are reserved, so we expect // an EADDRNOTAVAIL error. let sockaddr = SockAddr::new_vsock(libc::VMADDR_CID_HYPERVISOR, port); assert_eq!(bind(s1, &sockaddr).err(), Some(Error::Sys(Errno::EADDRNOTAVAIL))); - let sockaddr = SockAddr::new_vsock(libc::VMADDR_CID_RESERVED, port); + let sockaddr = SockAddr::new_vsock(libc::VMADDR_CID_LOCAL, port); assert_eq!(bind(s1, &sockaddr).err(), Some(Error::Sys(Errno::EADDRNOTAVAIL))); |