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.

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

Test #[unix_sigpipe = "inherit"] with both SIG_DFL and SIG_IGN #123316

Merged
merged 1 commit into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//@ aux-crate: sigpipe_utils=sigpipe-utils.rs

#![feature(unix_sigpipe)]

#[unix_sigpipe = "inherit"]
fn main() {
sigpipe_utils::assert_sigpipe_handler(sigpipe_utils::SignalHandler::Default);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//@ aux-crate: sigpipe_utils=sigpipe-utils.rs

#![feature(unix_sigpipe)]

#[unix_sigpipe = "inherit"]
fn main() {
sigpipe_utils::assert_sigpipe_handler(sigpipe_utils::SignalHandler::Ignore);
}
31 changes: 23 additions & 8 deletions tests/ui/attributes/unix_sigpipe/unix_sigpipe-inherit.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,29 @@
//@ ignore-cross-compile because aux-bin does not yet support it
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you open a GH issue for that if you think it'd be convenient to support this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done with #124361

//@ only-unix because SIGPIPE is a unix thing
//@ aux-bin: assert-inherit-sig_dfl.rs
//@ aux-bin: assert-inherit-sig_ign.rs
//@ run-pass
//@ aux-build:sigpipe-utils.rs

#![feature(unix_sigpipe)]
#![feature(rustc_private, unix_sigpipe)]

#[unix_sigpipe = "inherit"]
extern crate libc;

// By default the Rust runtime resets SIGPIPE to SIG_DFL before exec:ing child
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As an aside: Regarding exec:ing, I've never seen this typographic convention before (non-native speaker), I only know of using ' in such contexts.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed (I'm not a native speaker either):

$ git grep "'ing" | wc -l
24

I'll fix it in upcoming PRs in this area.

// processes so opt-out of that with `#[unix_sigpipe = "sig_dfl"]`. See
// https://github.com/rust-lang/rust/blob/bf4de3a874753bbee3323081c8b0c133444fed2d/library/std/src/sys/pal/unix/process/process_unix.rs#L359-L384
#[unix_sigpipe = "sig_dfl"]
fn main() {
extern crate sigpipe_utils;
// First expect SIG_DFL in a child process with #[unix_sigpipe = "inherit"].
assert_inherit_sigpipe_disposition("auxiliary/bin/assert-inherit-sig_dfl");

// With SIG_IGN we expect #[unix_sigpipe = "inherit"] to also get SIG_IGN.
unsafe {
libc::signal(libc::SIGPIPE, libc::SIG_IGN);
}
assert_inherit_sigpipe_disposition("auxiliary/bin/assert-inherit-sig_ign");
}

// #[unix_sigpipe = "inherit"] is active, so SIGPIPE shall NOT be ignored,
// instead the default handler shall be installed. (We assume that the
// process that runs these tests have the default handler.)
sigpipe_utils::assert_sigpipe_handler(sigpipe_utils::SignalHandler::Default);
fn assert_inherit_sigpipe_disposition(aux_bin: &str) {
let mut cmd = std::process::Command::new(aux_bin);
assert!(cmd.status().unwrap().success());
}
Loading