Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes tests on Solaris. #1228

Merged
merged 1 commit into from
Dec 8, 2024
Merged

Fixes tests on Solaris. #1228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/backend/libc/c.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ pub(crate) const O_LARGEFILE: c_int = linux_raw_sys::general::O_LARGEFILE as _;

// Gated under `_LARGEFILE_SOURCE` but automatically set by the kernel.
// <https://github.com/illumos/illumos-gate/blob/fb2cb638e5604b214d8ea8d4f01ad2e77b437c17/usr/src/ucbhead/sys/fcntl.h#L64>
#[cfg(target_os = "illumos")]
#[cfg(solarish)]
pub(crate) const O_LARGEFILE: c_int = 0x2000;

// TODO: This is new in Linux 6.11; remove when linux-raw-sys is updated.
Expand Down
2 changes: 1 addition & 1 deletion src/backend/libc/fs/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ bitflags! {
/// Note that rustix and/or libc will automatically set this flag when appropriate on
/// `open(2)` and friends, thus typical users do not need to care about it.
/// It will may be reported in return of `fcntl_getfl`, though.
#[cfg(any(linux_kernel, target_os = "illumos"))]
#[cfg(any(linux_kernel, solarish))]
const LARGEFILE = bitcast!(c::O_LARGEFILE);

/// <https://docs.rs/bitflags/*/bitflags/#externally-defined-flags>
Expand Down
2 changes: 1 addition & 1 deletion tests/fs/file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ fn test_file() {

// Clear `O_LARGEFILE`, which may be set by rustix on 32-bit Linux or
// automatically by some kernel on 64-bit (Linux and illumos).
#[cfg(any(linux_kernel, target_os = "illumos"))]
#[cfg(any(linux_kernel, solarish))]
let fl = fl - rustix::fs::OFlags::LARGEFILE;

assert_eq!(fl, rustix::fs::OFlags::empty());
Expand Down
8 changes: 4 additions & 4 deletions tests/net/dgram.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ fn net_dgram_v6_bind_any() {
}

/// Test `sendto` with calling `connect`, on platforms which support that.
#[cfg(not(any(bsd, target_os = "illumos")))]
#[cfg(not(any(bsd, solarish)))]
#[test]
fn net_dgram_v4_connect_sendto() {
crate::init();
Expand Down Expand Up @@ -439,7 +439,7 @@ fn net_dgram_v4_sendto() {
}

/// Similar, but with V6.
#[cfg(not(any(bsd, target_os = "illumos")))]
#[cfg(not(any(bsd, solarish)))]
#[test]
fn net_dgram_v6_connect_sendto() {
crate::init();
Expand Down Expand Up @@ -533,7 +533,7 @@ fn net_dgram_v6_sendto() {
}

/// Test `sendto_any` with calling connect, on platforms which support that.
#[cfg(not(any(bsd, target_os = "illumos")))]
#[cfg(not(any(bsd, solarish)))]
#[test]
fn net_dgram_v4_connect_sendto_any() {
crate::init();
Expand Down Expand Up @@ -621,7 +621,7 @@ fn net_dgram_v4_sendto_any() {
}

/// Similar, but with V6.
#[cfg(not(any(bsd, target_os = "illumos")))]
#[cfg(not(any(bsd, solarish)))]
#[test]
fn net_dgram_v6_connect_sendto_any() {
crate::init();
Expand Down
6 changes: 3 additions & 3 deletions tests/net/sockopt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,9 @@ fn test_sockopts_ipv4() {
assert_eq!(sockopt::get_socket_domain(&s).unwrap(), AddressFamily::INET);
assert_ne!(sockopt::get_ip_ttl(&s).unwrap(), 0);
assert_ne!(sockopt::get_ip_ttl(&s).unwrap(), 77);
#[cfg(not(any(bsd, windows, target_os = "illumos")))]
#[cfg(not(any(bsd, windows, solarish)))]
assert!(sockopt::get_ip_multicast_loop(&s).unwrap());
#[cfg(not(any(bsd, windows, target_os = "illumos")))]
#[cfg(not(any(bsd, windows, solarish)))]
assert_eq!(sockopt::get_ip_multicast_ttl(&s).unwrap(), 1);

// Set the ip ttl.
Expand All @@ -323,7 +323,7 @@ fn test_sockopts_ipv4() {
// Check the ip ttl.
assert_eq!(sockopt::get_ip_ttl(&s).unwrap(), 77);

#[cfg(not(any(bsd, windows, target_os = "illumos")))]
#[cfg(not(any(bsd, windows, solarish)))]
{
// Set the multicast loop flag;
sockopt::set_ip_multicast_loop(&s, false).unwrap();
Expand Down
2 changes: 1 addition & 1 deletion tests/net/unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ fn do_test_unix_msg(addr: SocketAddrUnix) {
// Don't ask me why, but this was seen to fail on FreeBSD.
// `SocketAddrUnix::path()` returned `None` for some reason.
// illumos and NetBSD too.
#[cfg(not(any(target_os = "freebsd", target_os = "illumos", target_os = "netbsd")))]
#[cfg(not(any(solarish, target_os = "freebsd", target_os = "netbsd")))]
assert_eq!(
Some(rustix::net::SocketAddrAny::Unix(addr.clone())),
result.address
Expand Down
2 changes: 1 addition & 1 deletion tests/net/unix_alloc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ fn do_test_unix_msg(addr: SocketAddrUnix) {
// Don't ask me why, but this was seen to fail on FreeBSD.
// `SocketAddrUnix::path()` returned `None` for some reason.
// illumos and NetBSD too.
#[cfg(not(any(target_os = "freebsd", target_os = "illumos", target_os = "netbsd")))]
#[cfg(not(any(solarish, target_os = "freebsd", target_os = "netbsd")))]
assert_eq!(
Some(rustix::net::SocketAddrAny::Unix(addr.clone())),
result.address
Expand Down
Loading