bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

tests: port jobserver-error.rs to rmake.rs

Browse source 
Co-authored-by: Noa <coolreader18@gmail.com>
Co-authored-by: Oneirical <manchot@videotron.ca>
This commit is contained in:
许杰友 Jieyou Xu (Joe) 2025-01-14 07:04:51 +08:00
parent ead78bb243
commit 20229200c8
4 changed files with 48 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/tools/tidy/src/allowed_run_make_makefiles.txt
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

17
tests/run-make/jobserver-error/Makefile
View file

@ -1,17 +0,0 @@
include ../tools.mk
# only-linux
# ignore-cross-compile
# Test compiler behavior in case environment specifies wrong jobserver.
# Note that by default, the compiler uses file descriptors 0 (stdin), 1 (stdout), 2 (stderr),
# but also 3 and 4 for either end of the ctrl-c signal handler self-pipe.
all:
bash -c 'echo "fn main() {}" | MAKEFLAGS="--jobserver-auth=5,5" $(RUSTC)' 2>&1 | diff cannot_open_fd.stderr -
bash -c 'echo "fn main() {}" | MAKEFLAGS="--jobserver-auth=3,3" $(RUSTC) - 3</dev/null' 2>&1 | diff not_a_pipe.stderr -
# This test randomly fails, see https://github.com/rust-lang/rust/issues/110321
disabled:
bash -c 'echo "fn main() {}" | MAKEFLAGS="--jobserver-auth=3,3" $(RUSTC) - 3< <(cat /dev/null)' 2>&1 | diff poisoned_pipe.stderr -

2
tests/run-make/jobserver-error/cannot_open_fd.stderr
View file

@ -1,4 +1,4 @@
warning: failed to connect to jobserver from environment variable `MAKEFLAGS="--jobserver-auth=5,5"`: cannot open file descriptor 5 from the jobserver environment variable value: Bad file descriptor (os error 9)
warning: failed to connect to jobserver from environment variable `MAKEFLAGS="--jobserver-auth=1000,1000"`: cannot open file descriptor 1000 from the jobserver environment variable value: Bad file descriptor (os error 9)
|
= note: the build environment is likely misconfigured

47
tests/run-make/jobserver-error/rmake.rs Normal file
View file

@ -0,0 +1,47 @@
// ignore-tidy-linelength
//! If the environment variables contain an invalid `jobserver-auth`, this used to cause an ICE
//! until this was fixed in [do not panic on failure to acquire jobserver token
//! #109694](https://github.com/rust-lang/rust/pull/109694).
//!
//! Proper handling has been added, and this test checks that helpful warnings and errors are
//! printed instead in case of a wrong jobserver. See
//! <https://github.com/rust-lang/rust/issues/46981>.
//@ only-linux
//@ ignore-cross-compile
#![deny(warnings)]
use run_make_support::{diff, rustc};
fn main() {
let out = rustc()
.stdin_buf(("fn main() {}").as_bytes())
.env("MAKEFLAGS", "--jobserver-auth=1000,1000")
.run_fail()
.stderr_utf8();
diff().expected_file("cannot_open_fd.stderr").actual_text("actual", out).run();
let out = rustc()
.stdin_buf(("fn main() {}").as_bytes())
.input("-")
.env("MAKEFLAGS", "--jobserver-auth=3,3")
.set_aux_fd(3, std::fs::File::open("/dev/null").unwrap())
.run()
.stderr_utf8();
diff().expected_file("not_a_pipe.stderr").actual_text("actual", out).run();
// FIXME(#110321): the Makefile version had a disabled check:
//
// ```makefile
// bash -c 'echo "fn main() {}" | MAKEFLAGS="--jobserver-auth=3,3" $(RUSTC) - 3< <(cat /dev/null)' 2>&1 | diff poisoned_pipe.stderr -
// ```
//
// > the jobserver helper thread launched here gets starved out and doesn't run, while the
// > coordinator thread continually processes work using the implicit jobserver token, never
// > yielding long enough for the jobserver helper to do its work (and process the error).
//
// but is not necessarily worth fixing as it might require changing coordinator behavior that
// might regress performance. See discussion at
// <https://github.com/rust-lang/rust/issues/110321#issuecomment-1636914956>.
}