Skip to content

move uefi test to run-make #144454

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
Merged
merged 1 commit into from
Jul 27, 2025
Merged

move uefi test to run-make #144454

merged 1 commit into from
Jul 27, 2025
+90 −151

Conversation

folkertdev
Copy link
Contributor

@folkertdev folkertdev commented Jul 25, 2025 •
edited
Loading

Turn the uefi test into a more standard run-make test, and execute it using the test-various CI job like before.

This is just a straightforward translation of the python code, but using run-make to supply the target (hence the 3 separate calls in the docker file).

r? @jieyouxu
cc @nicholasbishop

try-job: test-various

@rustbot
Copy link
Collaborator

rustbot commented Jul 25, 2025

jieyouxu is currently at their maximum review capacity.
They may take a while to respond.

@rustbot rustbot added A-CI Area: Our Github Actions CI A-compiletest Area: The compiletest test runner A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Jul 25, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jul 25, 2025

This PR modifies run-make tests.

cc @jieyouxu

There are changes to the tidy tool.

cc @jieyouxu

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@folkertdev
Copy link
Contributor Author

@bors2 try

rust-bors bot added a commit that referenced this pull request Jul 25, 2025
@rust-bors
Auto merge of #144454 - folkertdev:uefi-tests, r=<try>
257113a 
move uefi test to run-make

try-job: test-various
@rust-bors
Copy link

rust-bors bot commented Jul 25, 2025

⌛ Trying commit cd4474e with merge 257113a…

To cancel the try build, run the command @bors try cancel.

@rust-bors
Copy link

rust-bors bot commented Jul 25, 2025

☀️ Try build successful (CI)
Build commit: 257113a (257113ae5f26b03ebcd0f6a5eb1aae5dbb1e127b, parent: a955f1cd09a027363729ceed919952d09f76f28e)

@nicholasbishop
Copy link
Contributor

Linking to the zulip discussion for future reference: #t-compiler > testing uefi with run-make?

jieyouxu
jieyouxu reviewed Jul 26, 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. Ideally, I think we'd still want to vendor and pin the r-efi version especially as this is actually exercised in full CI. But this is at least no worse than before, so just some nits.

@jieyouxu
Copy link
Member

@rustbot author

@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 26, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jul 26, 2025

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@rustbot rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 26, 2025
@folkertdev
Copy link
Contributor Author

@rustbot ready

@rustbot rustbot 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 Jul 26, 2025
@folkertdev
Copy link
Contributor Author

Also I do still think removing the dependency is a good idea, but I'll leave that to @nicholasbishop once this is merged.

@folkertdev folkertdev mentioned this pull request Jul 26, 2025
Open
jieyouxu
jieyouxu approved these changes Jul 26, 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, you can r=me after PR CI is green.

@folkertdev
Copy link
Contributor Author

@bors r=jieyouxu

@bors
Copy link
Collaborator

bors commented Jul 26, 2025

📌 Commit bd7b023 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 Jul 26, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 26, 2025
@matthiaskrgr
Rollup merge of rust-lang#144454 - folkertdev:uefi-tests, r=jieyouxu
8185eeb 
move uefi test to run-make

Turn the `uefi` test into a more standard `run-make` test, and execute it using the `test-various` CI job like before.

This is just a straightforward translation of the python code, but using `run-make` to supply the target (hence the 3 separate calls in the docker file).

r? `@jieyouxu`
cc `@nicholasbishop`

try-job: test-various
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 26, 2025
Closed
bors added a commit that referenced this pull request Jul 26, 2025
@bors
Auto merge of #144508 - matthiaskrgr:rollup-osxaqi3, r=matthiaskrgr
f5b62eb 
Rollup of 10 pull requests

Successful merges:

 - #144359 (add codegen test for variadics)
 - #144409 (Stop compilation early if macro expansion failed)
 - #144422 (library/windows_targets: Fix macro expansion error in 'link' macro)
 - #144430 (tests: aarch64-outline-atomics: Remove hardcoded target)
 - #144445 (Fix `./x check bootstrap` (again))
 - #144453 (canonicalize build root in `tests/run-make/linker-warning`)
 - #144454 (move uefi test to run-make)
 - #144464 (Only run bootstrap tests in `x test` on CI)
 - #144495 (bump cargo_metadata)
 - #144500 (thread name in stack overflow message)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 26, 2025
@matthiaskrgr
Rollup merge of rust-lang#144454 - folkertdev:uefi-tests, r=jieyouxu
debedb3 
move uefi test to run-make

Turn the `uefi` test into a more standard `run-make` test, and execute it using the `test-various` CI job like before.

This is just a straightforward translation of the python code, but using `run-make` to supply the target (hence the 3 separate calls in the docker file).

r? ``@jieyouxu``
cc ``@nicholasbishop``

try-job: test-various
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 26, 2025
Closed
bors added a commit that referenced this pull request Jul 26, 2025
@bors
Auto merge of #144516 - matthiaskrgr:rollup-zoaluag, r=matthiaskrgr
9faeadc 
Rollup of 9 pull requests

Successful merges:

 - #144359 (add codegen test for variadics)
 - #144409 (Stop compilation early if macro expansion failed)
 - #144422 (library/windows_targets: Fix macro expansion error in 'link' macro)
 - #144430 (tests: aarch64-outline-atomics: Remove hardcoded target)
 - #144445 (Fix `./x check bootstrap` (again))
 - #144453 (canonicalize build root in `tests/run-make/linker-warning`)
 - #144454 (move uefi test to run-make)
 - #144464 (Only run bootstrap tests in `x test` on CI)
 - #144495 (bump cargo_metadata)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 27, 2025
Merged
bors added a commit that referenced this pull request Jul 27, 2025
@bors
Auto merge of #144528 - matthiaskrgr:rollup-felcjc1, r=matthiaskrgr
eed187c 
Rollup of 4 pull requests

Successful merges:

 - #144226 (Do not assert layout in KnownPanicsLint.)
 - #144385 (Optimize performance by inline in macro hygiene system)
 - #144454 (move uefi test to run-make)
 - #144455 (Unify LLVM ctlz/cttz intrinsic generation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9b3d4cb into rust-lang:master Jul 27, 2025
10 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 27, 2025
rust-timer added a commit that referenced this pull request Jul 27, 2025
@rust-timer
Unrolled build for #144454
dd8f959 
Rollup merge of #144454 - folkertdev:uefi-tests, r=jieyouxu

move uefi test to run-make

Turn the `uefi` test into a more standard `run-make` test, and execute it using the `test-various` CI job like before.

This is just a straightforward translation of the python code, but using `run-make` to supply the target (hence the 3 separate calls in the docker file).

r? ```@jieyouxu```
cc ```@nicholasbishop```

try-job: test-various
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nicholasbishop nicholasbishop nicholasbishop approved these changes

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
A-CI Area: Our Github Actions CI A-compiletest Area: The compiletest test runner A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.90.0
Development

Successfully merging this pull request may close these issues.
5 participants
@folkertdev @rustbot @nicholasbishop @jieyouxu @bors