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

jieyouxu · 2025-01-13T23:12:13Z

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

…=<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

jieyouxu · 2025-01-14T00:42:51Z

@bors try

bors · 2025-01-14T00:44:00Z

⌛ Trying commit aaddf77 with merge 163ddb1...

…=<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

bors · 2025-01-14T03:06:12Z

☀️ Try build successful - checks-actions
Build commit: 163ddb1 (163ddb169c67425e679c412d12576fae3f34df92)

jieyouxu · 2025-01-14T03:06:42Z

r? compiler

tests/run-make/jobserver-error/rmake.rs

src/tools/run-make-support/src/command.rs

…=Noratrieb 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.` try-job: aarch64-gnu try-job: i686-gnu-1 try-job: x86_64-gnu-debug try-job: x86_64-gnu-llvm-18-1

bors · 2025-01-21T18:10:42Z

💔 Test failed - checks-actions

Noratrieb · 2025-01-21T19:24:29Z

hiii bors

jieyouxu · 2025-01-22T02:36:14Z

Rescoped the import to the cfg(unix)'d code path.
@bors r=@Noratrieb

bors · 2025-01-22T02:36:17Z

📌 Commit 8f00fbe has been approved by Noratrieb

It is now in the queue for this repository.

bors · 2025-01-22T04:17:23Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout migrate-jobserver-errors (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self migrate-jobserver-errors --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Removing tests/run-make/jobserver-error/Makefile
Auto-merging src/tools/tidy/src/allowed_run_make_makefiles.txt
CONFLICT (content): Merge conflict in src/tools/tidy/src/allowed_run_make_makefiles.txt
Automatic merge failed; fix conflicts and then commit the result.

Co-authored-by: Noa <[email protected]> Co-authored-by: Oneirical <[email protected]>

jieyouxu · 2025-01-22T04:27:32Z

Merge conflicted due to allow-list.
@bors r=Noratrieb

bors · 2025-01-22T04:27:34Z

📌 Commit 2022920 has been approved by Noratrieb

It is now in the queue for this repository.

bors · 2025-01-23T05:31:15Z

⌛ Testing commit 2022920 with merge cf577f3...

bors · 2025-01-23T08:15:51Z

☀️ Test successful - checks-actions
Approved by: Noratrieb
Pushing cf577f3 to master...

rust-timer · 2025-01-23T09:31:35Z

Finished benchmarking commit (cf577f3): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary -1.8%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.8%	[-4.1%, -0.6%]	3
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 776.393s -> 776.757s (0.05%)
Artifact size: 325.90 MiB -> 325.99 MiB (0.03%)

jieyouxu mentioned this pull request Jan 13, 2025

Migrate jobserver-error run-make test to rmake #128789

Closed

This comment was marked as off-topic.

Sign in to view

jieyouxu mentioned this pull request Jan 13, 2025

Tracking Issue for porting run-make tests to use Rust #121876

Open

This comment was marked as off-topic.

Sign in to view

jieyouxu added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 13, 2025

jieyouxu changed the title ~~tests: Port jobserver-error.rs to rmake.rs~~ tests: Port jobserver-error to rmake.rs Jan 13, 2025

jieyouxu added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 14, 2025

jieyouxu marked this pull request as ready for review January 14, 2025 03:06

jieyouxu closed this Jan 14, 2025

jieyouxu reopened this Jan 14, 2025

rustbot assigned chenyukang Jan 14, 2025

jieyouxu force-pushed the migrate-jobserver-errors branch from aaddf77 to 8c41872 Compare January 16, 2025 09:12

Noratrieb reviewed Jan 19, 2025

View reviewed changes

tests/run-make/jobserver-error/rmake.rs Outdated Show resolved Hide resolved

src/tools/run-make-support/src/command.rs Outdated Show resolved Hide resolved

Noratrieb assigned Noratrieb and unassigned chenyukang Jan 19, 2025

jieyouxu removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 20, 2025

This comment has been minimized.

Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 21, 2025

jieyouxu added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 22, 2025

jieyouxu force-pushed the migrate-jobserver-errors branch from b595764 to 8f00fbe Compare January 22, 2025 02:35

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 22, 2025

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 22, 2025

jieyouxu and others added 2 commits January 22, 2025 12:26

run-make-support: add set_aux_fd helper

ead78bb

Co-authored-by: Noa <[email protected]> Co-authored-by: Oneirical <[email protected]>

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

2022920

Co-authored-by: Noa <[email protected]> Co-authored-by: Oneirical <[email protected]>

jieyouxu force-pushed the migrate-jobserver-errors branch from 8f00fbe to 2022920 Compare January 22, 2025 04:27

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 22, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 23, 2025

bors merged commit cf577f3 into rust-lang:master Jan 23, 2025
7 checks passed

rustbot added this to the 1.86.0 milestone Jan 23, 2025

jieyouxu deleted the migrate-jobserver-errors branch January 23, 2025 08:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

jieyouxu commented Jan 13, 2025 •

edited

Loading

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

jieyouxu commented Jan 14, 2025

bors commented Jan 14, 2025

bors commented Jan 14, 2025

jieyouxu commented Jan 14, 2025

This comment has been minimized.

bors commented Jan 21, 2025

Noratrieb commented Jan 21, 2025

jieyouxu commented Jan 22, 2025

bors commented Jan 22, 2025

bors commented Jan 22, 2025

jieyouxu commented Jan 22, 2025

bors commented Jan 22, 2025

bors commented Jan 23, 2025

bors commented Jan 23, 2025

rust-timer commented Jan 23, 2025

tests: Port jobserver-error to rmake.rs #135461

tests: Port jobserver-error to rmake.rs #135461

Conversation

jieyouxu commented Jan 13, 2025 • edited Loading

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

jieyouxu commented Jan 14, 2025

bors commented Jan 14, 2025

bors commented Jan 14, 2025

jieyouxu commented Jan 14, 2025

This comment has been minimized.

bors commented Jan 21, 2025

Noratrieb commented Jan 21, 2025

jieyouxu commented Jan 22, 2025

bors commented Jan 22, 2025

bors commented Jan 22, 2025

jieyouxu commented Jan 22, 2025

bors commented Jan 22, 2025

bors commented Jan 23, 2025

bors commented Jan 23, 2025

rust-timer commented Jan 23, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

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

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

jieyouxu commented Jan 13, 2025 •

edited

Loading