Auto merge of #135461 - jieyouxu:migrate-jobserver-errors, r=Noratrieb

tests: Port `jobserver-error` to rmake.rs

Part of #121876.

This PR ports `tests/run-make/jobserver-error` to rmake.rs, and is basically #128789 slightly adjusted.

The complexity involved here is mostly how to get `/dev/null/` piping to fd 3 working with std `Command`, whereas with a shell this is much easier (as is evident with the `Makefile` version).

Supersedes #128789.
This PR is co-authored with `@Oneirical` and `@coolreader18.`

try-job: aarch64-gnu
try-job: i686-gnu-1
try-job: x86_64-gnu-debug
try-job: x86_64-gnu-llvm-18-1
This commit is contained in:
bors 2025-01-23 05:31:12 +00:00
commit cf577f34c4
6 changed files with 114 additions and 19 deletions

View file

@ -151,6 +151,61 @@ impl Command {
self
}
/// Set an auxiliary stream passed to the process, besides the stdio streams.
///
/// # Notes
///
/// Use with caution! Ideally, only set one aux fd; if there are multiple, their old `fd` may
/// overlap with another's `new_fd`, and may break. The caller must make sure this is not the
/// case. This function is only "safe" because the safety requirements are practically not
/// possible to uphold.
#[cfg(unix)]
pub fn set_aux_fd<F: Into<std::os::fd::OwnedFd>>(
&mut self,
new_fd: std::os::fd::RawFd,
fd: F,
) -> &mut Self {
use std::mem;
// NOTE: If more than 1 auxiliary file descriptor is needed, this function should be
// rewritten.
use std::os::fd::AsRawFd;
use std::os::unix::process::CommandExt;
let cvt = |x| if x == -1 { Err(std::io::Error::last_os_error()) } else { Ok(()) };
// Ensure fd stays open until the fork.
let fd = mem::ManuallyDrop::new(fd.into());
let fd = fd.as_raw_fd();
if fd == new_fd {
// If the new file descriptor is already the same as fd, just turn off `FD_CLOEXEC`.
let fd_flags = {
let ret = unsafe { libc::fcntl(fd, libc::F_GETFD, 0) };
if ret < 0 {
panic!("failed to read fd flags: {}", std::io::Error::last_os_error());
}
ret
};
// Clear `FD_CLOEXEC`.
let fd_flags = fd_flags & !libc::FD_CLOEXEC;
// SAFETY(io-safety): `fd` is already owned.
cvt(unsafe { libc::fcntl(fd, libc::F_SETFD, fd_flags as libc::c_int) })
.expect("disabling CLOEXEC failed");
}
let pre_exec = move || {
if fd.as_raw_fd() != new_fd {
// SAFETY(io-safety): it's the caller's responsibility that we won't override the
// target fd.
cvt(unsafe { libc::dup2(fd, new_fd) })?;
}
Ok(())
};
// SAFETY(pre-exec-safe): `dup2` is pre-exec-safe.
unsafe { self.cmd.pre_exec(pre_exec) };
self
}
/// Run the constructed command and assert that it is successfully run.
///
/// By default, std{in,out,err} are [`Stdio::piped()`].

View file

@ -104,6 +104,17 @@ macro_rules! impl_common_helpers {
self
}
/// Set an auxiliary stream passed to the process, besides the stdio streams.
#[cfg(unix)]
pub fn set_aux_fd<F: Into<std::os::fd::OwnedFd>>(
&mut self,
new_fd: std::os::fd::RawFd,
fd: F,
) -> &mut Self {
self.cmd.set_aux_fd(new_fd, fd);
self
}
/// Run the constructed command and assert that it is successfully run.
#[track_caller]
pub fn run(&mut self) -> crate::command::CompletedProcess {

View file

@ -1,4 +1,3 @@
run-make/jobserver-error/Makefile
run-make/split-debuginfo/Makefile
run-make/symbol-mangling-hashed/Makefile
run-make/translation/Makefile