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.

Sign up for GitHub

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

Jump to bottom

Reintroduce remote-test support in run-make tests #138652

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Reintroduce remote-test support in run-make tests #138652

wants to merge 2 commits into from
+18 −1

Conversation

pietroalbini
Copy link
Member

@pietroalbini pietroalbini commented Mar 18, 2025 •
edited by jieyouxu
Loading

The old Makefile-based infrastructure included support for executing binaries with remote-test-client if configured, but that didn't get ported to run_make_support as part of the rmake migration.

This PR re-introduces back that support, with the same implementation (and limitations) of the original Makefile-based support.

Old Makefile-based implementation of this

try-job: armhf-gnu

@rustbot
Copy link
Collaborator

rustbot commented Mar 18, 2025

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 18, 2025
@rustbot
Copy link
Collaborator

rustbot commented Mar 18, 2025

The run-make-support library was changed

cc @jieyouxu

@pietroalbini
reintroduce remote-test support in run-make tests
5fe1e47 
The old Makefile-based infrastructure included support for executing
binaries with remote-test-client if configured, but that didn't get
ported to run_make_support as part of the rmake migration.

This PR re-introduces back that support, with the same implementation
(and limitations) of the original Makefile-based support.
@pietroalbini pietroalbini force-pushed the pa-remote-test-rmake branch from 9c75640 to 5fe1e47 Compare March 18, 2025 09:11
jieyouxu
jieyouxu approved these changes Mar 18, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks, I was never sure about the remote-test-client scheme, and will have to look into it. But for this specifically, it at least preserves the current behaviour for non-remote-test-client runs, so 🤷

@jieyouxu
Copy link
Member

r=me unless you have any other changes

@jieyouxu jieyouxu assigned jieyouxu and unassigned Mark-Simulacrum Mar 18, 2025
@jieyouxu
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 18, 2025

📌 Commit 5fe1e47 has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 18, 2025
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Mar 20, 2025
@jieyouxu
Rollup merge of rust-lang#138652 - ferrocene:pa-remote-test-rmake, r=…
be60742 
…jieyouxu

Reintroduce remote-test support in run-make tests

The old Makefile-based infrastructure included support for executing binaries with remote-test-client if configured, but that didn't get ported to run_make_support as part of the rmake migration.

This PR re-introduces back that support, with the same implementation (and limitations) of the original Makefile-based support.

[Old Makefile-based implementation of this](https://github.com/rust-lang/rust/blob/9b8accbeb6336fa24d02b2a8bcaecaf44fe2bb65/tests/run-make/tools.mk#L65-L74)
@jieyouxu jieyouxu mentioned this pull request Mar 20, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 20, 2025
@bors
Auto merge of rust-lang#138733 - jieyouxu:rollup-hcgwhei, r=jieyouxu
765a6ca 
Rollup of 15 pull requests

Successful merges:

 - rust-lang#138321 ([bootstrap] Distribute split debuginfo if present)
 - rust-lang#138364 (ports the compiler test cases to new rust_intrinsic format)
 - rust-lang#138410 (Couple mir building cleanups)
 - rust-lang#138435 (Add support for postfix yield expressions)
 - rust-lang#138536 (stable_mir: Add `MutMirVisitor`)
 - rust-lang#138623 ([bootstrap] Use llvm_runtimes for compiler-rt)
 - rust-lang#138650 (Optimize `io::Write::write_fmt` for constant strings)
 - rust-lang#138652 (Reintroduce remote-test support in run-make tests)
 - rust-lang#138685 (Use `Option<Ident>` for lowered param names.)
 - rust-lang#138694 (Fix: add ohos target notes)
 - rust-lang#138700 (Suggest `-Whelp` when pass `--print lints` to rustc)
 - rust-lang#138709 (Update GCC submodule)
 - rust-lang#138724 (Check attrs: Don't try to retrieve the name of list stems)
 - rust-lang#138731 (coverage: Add LLVM plumbing for expansion regions)
 - rust-lang#138732 (Use `def_path_str` for def id arg in `UnsupportedOpInfo`)

r? `@ghost`
`@rustbot` modify labels: rollup
@jieyouxu
Copy link
Member

Checking if the rollup failure was spurious.
@bors r-

@bors 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 Mar 20, 2025
@jieyouxu
Copy link
Member

@bors try

@bors
Copy link
Contributor

bors commented Mar 20, 2025

⌛ Trying commit 5fe1e47 with merge 57b3445...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 20, 2025
@bors
Auto merge of rust-lang#138652 - ferrocene:pa-remote-test-rmake, r=<try>
57b3445 
Reintroduce remote-test support in run-make tests

The old Makefile-based infrastructure included support for executing binaries with remote-test-client if configured, but that didn't get ported to run_make_support as part of the rmake migration.

This PR re-introduces back that support, with the same implementation (and limitations) of the original Makefile-based support.

[Old Makefile-based implementation of this](https://github.com/rust-lang/rust/blob/9b8accbeb6336fa24d02b2a8bcaecaf44fe2bb65/tests/run-make/tools.mk#L65-L74)

try-job: armhf-gnu
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Mar 20, 2025

💔 Test failed - checks-actions

@jieyouxu
Copy link
Member

jieyouxu commented Mar 20, 2025 •
edited
Loading

Oh, I think these two tests are missing target() flags and are trying to run a host binary? This would probably be improved by #138066.

@rustbot
Copy link
Collaborator

rustbot commented Mar 21, 2025

This PR modifies run-make tests.

cc @jieyouxu

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 21, 2025
@pietroalbini
Copy link
Member Author

@bors try

@jieyouxu 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 Mar 23, 2025
@jieyouxu
Copy link
Member

jieyouxu commented Mar 24, 2025 •
edited
Loading

Oh I see. tests/run-make/doctests-keep-binaries's old Makefile version had ignore-cross-compile but not in the run-make version, because the run-make version never tried to produce artifacts for the target platform and only runs host artifacts. I would add //@ ignore-cross-compile (runs binary) for that test, and probably just drop the target() specifications in that test.

@jieyouxu
Copy link
Member

Similarly tests/run-make/target-cpu-native probably needs to be a host-only test because it wants to run the binary.

@jieyouxu
Copy link
Member

@rustbot author

@rustbot rustbot 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 Mar 24, 2025
@pietroalbini pietroalbini force-pushed the pa-remote-test-rmake branch from 6dc5705 to f5659f2 Compare March 24, 2025 10:34
@pietroalbini
Copy link
Member Author

@bors try

@pietroalbini pietroalbini reopened this Mar 24, 2025
@pietroalbini
Copy link
Member Author

Not sure how I managed to close the PR.

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 24, 2025
@bors
Auto merge of rust-lang#138652 - ferrocene:pa-remote-test-rmake, r=<try>
19f913c 
Reintroduce remote-test support in run-make tests

The old Makefile-based infrastructure included support for executing binaries with remote-test-client if configured, but that didn't get ported to run_make_support as part of the rmake migration.

This PR re-introduces back that support, with the same implementation (and limitations) of the original Makefile-based support.

[Old Makefile-based implementation of this](https://github.com/rust-lang/rust/blob/9b8accbeb6336fa24d02b2a8bcaecaf44fe2bb65/tests/run-make/tools.mk#L65-L74)

try-job: armhf-gnu
@bors
Copy link
Contributor

bors commented Mar 24, 2025

⌛ Trying commit f5659f2 with merge 19f913c...

@bors
Copy link
Contributor

bors commented Mar 24, 2025

☀️ Try build successful - checks-actions
Build commit: 19f913c (19f913c569a063fc792ea018eae7d5e57d561132)

@jieyouxu
Copy link
Member

r=me unless u want to make any other changes

@pietroalbini
Copy link
Member Author

@bors r=jieyouxu

@bors
Copy link
Contributor

bors commented Mar 24, 2025

📌 Commit f5659f2 has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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 Mar 24, 2025
TaKO8Ki added a commit to TaKO8Ki/rust that referenced this pull request Mar 24, 2025
@TaKO8Ki
Rollup merge of rust-lang#138652 - ferrocene:pa-remote-test-rmake, r=…
ccb8278 
…jieyouxu

Reintroduce remote-test support in run-make tests

The old Makefile-based infrastructure included support for executing binaries with remote-test-client if configured, but that didn't get ported to run_make_support as part of the rmake migration.

This PR re-introduces back that support, with the same implementation (and limitations) of the original Makefile-based support.

[Old Makefile-based implementation of this](https://github.com/rust-lang/rust/blob/9b8accbeb6336fa24d02b2a8bcaecaf44fe2bb65/tests/run-make/tools.mk#L65-L74)

try-job: armhf-gnu
@TaKO8Ki TaKO8Ki mentioned this pull request Mar 24, 2025
Closed
TaKO8Ki added a commit to TaKO8Ki/rust that referenced this pull request Mar 24, 2025
@TaKO8Ki
Rollup merge of rust-lang#138652 - ferrocene:pa-remote-test-rmake, r=…
f382a2d 
…jieyouxu

Reintroduce remote-test support in run-make tests

The old Makefile-based infrastructure included support for executing binaries with remote-test-client if configured, but that didn't get ported to run_make_support as part of the rmake migration.

This PR re-introduces back that support, with the same implementation (and limitations) of the original Makefile-based support.

[Old Makefile-based implementation of this](https://github.com/rust-lang/rust/blob/9b8accbeb6336fa24d02b2a8bcaecaf44fe2bb65/tests/run-make/tools.mk#L65-L74)

try-job: armhf-gnu
@TaKO8Ki TaKO8Ki mentioned this pull request Mar 24, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2025
@bors
Auto merge of rust-lang#138912 - TaKO8Ki:rollup-optkc3z, r=TaKO8Ki
9e0c777 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#138385 (Keyword tweaks)
 - rust-lang#138580 (resolve: Avoid some unstable iteration 2)
 - rust-lang#138652 (Reintroduce remote-test support in run-make tests)
 - rust-lang#138701 (Make default_codegen_backend serializable)
 - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs)
 - rust-lang#138829 (Slightly reword triagebot ping message for `relnotes-interest-group`)
 - rust-lang#138837 (resolve: Avoid remaining unstable iteration)
 - rust-lang#138838 (Fix/tweak some tests in new solver)
 - rust-lang#138877 (Ignore doctests only in specified targets)
 - rust-lang#138895 (Add a helper for building an owner id in ast lowering)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2025
@bors
Auto merge of rust-lang#138912 - TaKO8Ki:rollup-optkc3z, r=TaKO8Ki
eacae09 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#138385 (Keyword tweaks)
 - rust-lang#138580 (resolve: Avoid some unstable iteration 2)
 - rust-lang#138652 (Reintroduce remote-test support in run-make tests)
 - rust-lang#138701 (Make default_codegen_backend serializable)
 - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs)
 - rust-lang#138829 (Slightly reword triagebot ping message for `relnotes-interest-group`)
 - rust-lang#138837 (resolve: Avoid remaining unstable iteration)
 - rust-lang#138838 (Fix/tweak some tests in new solver)
 - rust-lang#138877 (Ignore doctests only in specified targets)
 - rust-lang#138895 (Add a helper for building an owner id in ast lowering)

r? `@ghost`
`@rustbot` modify labels: rollup
TaKO8Ki added a commit to TaKO8Ki/rust that referenced this pull request Mar 25, 2025
@TaKO8Ki
Rollup merge of rust-lang#138652 - ferrocene:pa-remote-test-rmake, r=…
3101bfb 
…jieyouxu

Reintroduce remote-test support in run-make tests

The old Makefile-based infrastructure included support for executing binaries with remote-test-client if configured, but that didn't get ported to run_make_support as part of the rmake migration.

This PR re-introduces back that support, with the same implementation (and limitations) of the original Makefile-based support.

[Old Makefile-based implementation of this](https://github.com/rust-lang/rust/blob/9b8accbeb6336fa24d02b2a8bcaecaf44fe2bb65/tests/run-make/tools.mk#L65-L74)

try-job: armhf-gnu
@TaKO8Ki TaKO8Ki mentioned this pull request Mar 25, 2025
Open
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2025
@bors
Auto merge of rust-lang#138923 - TaKO8Ki:rollup-f3hkmqj, r=TaKO8Ki
15df8ec 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#138385 (Keyword tweaks)
 - rust-lang#138580 (resolve: Avoid some unstable iteration 2)
 - rust-lang#138652 (Reintroduce remote-test support in run-make tests)
 - rust-lang#138701 (Make default_codegen_backend serializable)
 - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs)
 - rust-lang#138829 (Slightly reword triagebot ping message for `relnotes-interest-group`)
 - rust-lang#138837 (resolve: Avoid remaining unstable iteration)
 - rust-lang#138838 (Fix/tweak some tests in new solver)
 - rust-lang#138895 (Add a helper for building an owner id in ast lowering)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@pietroalbini @rustbot @jieyouxu @bors @rust-log-analyzer @Mark-Simulacrum