tests: Port jobserver-error to rmake.rs
#135461
Open
+119
−18
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-run-make
This comment was marked as off-topic.
This comment was marked as off-topic.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 13, 2025
…=<try> tests: Port `jobserver-error.rs` to rmake.rs Part of rust-lang#121876. This PR ports `jobserver-error.rs` to rmake.rs, and is basically rust-lang#128789 slightly adjusted. Namely, `set_aux_fd` is made `unsafe`, alongside some doc updates. 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 rust-lang#128789. This PR is co-authored with `@Oneirical` and `@coolreader18.` r? `@ghost` try-job: aarch64-gnu try-job: i686-gnu-1 try-job: x86_64-gnu-debug try-job: x86_64-gnu-llvm-18-1
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
jieyouxu
added
S-waiting-on-author
jieyouxu
changed the title
jobserver-error.rs to rmake.rsjobserver-error to rmake.rs
|
@bors try |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 14, 2025
…=<try> tests: Port `jobserver-error` to rmake.rs Part of rust-lang#121876. This PR ports `tests/run-make/jobserver-error` to rmake.rs, and is basically rust-lang#128789 slightly adjusted. Namely, `set_aux_fd` is made `unsafe`, alongside some doc updates. 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 rust-lang#128789. This PR is co-authored with `@Oneirical` and `@coolreader18.` r? `@ghost` try-job: aarch64-gnu try-job: i686-gnu-1 try-job: x86_64-gnu-debug try-job: x86_64-gnu-llvm-18-1
|
☀️ Try build successful - checks-actions |
jieyouxu
added
S-waiting-on-review
|
r? compiler |
Co-authored-by: Noa <coolreader18@gmail.com> Co-authored-by: Oneirical <manchot@videotron.ca>
Co-authored-by: Noa <coolreader18@gmail.com> Co-authored-by: Oneirical <manchot@videotron.ca>
jieyouxu
force-pushed
the
migrate-jobserver-errors
branch
from
aaddf77 to
8c41872
Compare
Noratrieb
reviewed
Jan 19, 2025
| fn main() { | ||
| let out = rustc() | ||
| .stdin_buf(("fn main() {}").as_bytes()) | ||
| .env("MAKEFLAGS", "--jobserver-auth=5,5") |
There was a problem hiding this comment.
Suggested change
| .env("MAKEFLAGS", "--jobserver-auth=5,5") | |
| .env("MAKEFLAGS", "--jobserver-auth=1000,1000") |
use some higher FDs to guard against rustc using more fds initially
Comment on lines
+182
to
+183
| // The `pre_exec` function should be unconditionally set, since it captures `fd`, and | ||
| // this ensures that it stays open until the fork. |
There was a problem hiding this comment.
Wouldn't it still be closed once pre_exec returns? I think you need to mem::forget it explicitly.
Personally I would put fd in a ManuallyDrop at the beginning of the function and only work with its RawFd from that point on, that seems less prone to mistakes.
jieyouxu
added
S-waiting-on-author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #121876.
This PR ports
tests/run-make/jobserver-errorto rmake.rs, and is basically #128789 slightly adjusted. Namely,set_aux_fdis madeunsafe, alongside some doc updates.The complexity involved here is mostly how to get
/dev/null/piping to fd 3 working with stdCommand, whereas with a shell this is much easier (as is evident with theMakefileversion).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