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

Migrate test-benches, c-unwind-abi-catch-panic and compiler-lookup-paths-2 run-make tests to rmake #127985

Merged
merged 3 commits into from
Jul 22, 2024
Merged

Migrate test-benches, c-unwind-abi-catch-panic and compiler-lookup-paths-2 run-make tests to rmake #127985

merged 3 commits into from
Jul 22, 2024

Conversation

Oneirical
Copy link
Contributor

Part of #121876 and the associated Google Summer of Code project.

@rustbot
Copy link
Collaborator

rustbot commented Jul 19, 2024

r? @jieyouxu

rustbot has assigned @jieyouxu.
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 A-testsuite Area: The testsuite used to check the correctness of rustc 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) labels Jul 19, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 19, 2024

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

@Kobzol Kobzol mentioned this pull request Jul 19, 2024
Open
Kobzol
Kobzol reviewed Jul 19, 2024
View reviewed changes
Copy link
Contributor

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

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

Thanks! Left one nit, but I don't think it's super important. Feel free to r=me with or without fixing it.

r? @Kobzol

tests/run-make/test-benches/rmake.rs
use run_make_support::{run, run_with_args, rustc};

fn main() {
rustc().arg("--test").input("smokebench.rs").opt().run();
Copy link
Contributor

Choose a reason for hiding this comment

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

// Smoke-test that #[bench] isn't entirely broken.
I think we could keep the original comment here.

@rustbot rustbot assigned Kobzol and unassigned jieyouxu Jul 19, 2024
@rust-lang rust-lang deleted a comment from rustbot Jul 19, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Jul 19, 2024

@bors delegate +
@bors rollup

@Kobzol
Copy link
Contributor

Kobzol commented Jul 19, 2024

@bors delegate+

(sigh)

@bors
Copy link
Contributor

bors commented Jul 19, 2024

✌️ @Oneirical, you can now approve this pull request!

If @Kobzol told you to "r=me" after making some further change, please make that change, then do @bors r=@Kobzol

@Oneirical Oneirical force-pushed the testibule-of-hell branch from 51cc485 to 2192a91 Compare July 19, 2024 20:48
@Oneirical
Copy link
Contributor Author

@bors r=@Kobzol

Thanks for the review!

@bors
Copy link
Contributor

bors commented Jul 19, 2024

📌 Commit 2192a91 has been approved by Kobzol

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 19, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 20, 2024
@matthiaskrgr
Rollup merge of rust-lang#127985 - Oneirical:testibule-of-hell, r=Kobzol
7c6d836 
Migrate `test-benches`, `c-unwind-abi-catch-panic` and `compiler-lookup-paths-2` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 20, 2024
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 20, 2024
@matthiaskrgr
Rollup merge of rust-lang#127985 - Oneirical:testibule-of-hell, r=Kobzol
6043367 
Migrate `test-benches`, `c-unwind-abi-catch-panic` and `compiler-lookup-paths-2` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 20, 2024
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 21, 2024
@matthiaskrgr
Rollup merge of rust-lang#127985 - Oneirical:testibule-of-hell, r=Kobzol
fdf1843 
Migrate `test-benches`, `c-unwind-abi-catch-panic` and `compiler-lookup-paths-2` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 21, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 21, 2024
@bors
Auto merge of rust-lang#128024 - matthiaskrgr:rollup-3n1bufb, r=matth…
07c6913 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#126450 (Promote Mac Catalyst targets to Tier 2, and ship with rustup)
 - rust-lang#127177 (Distribute rustc_codegen_cranelift for arm64 macOS)
 - rust-lang#127510 (Rewrite `test-float-parse` in Rust)
 - rust-lang#127977 (Update wasi-sdk in CI to latest release)
 - rust-lang#127985 (Migrate `test-benches`, `c-unwind-abi-catch-panic` and `compiler-lookup-paths-2` `run-make` tests to rmake)
 - rust-lang#128023 (rustdoc: short descriptions cause word-breaks in tables)

r? `@ghost`
`@rustbot` modify labels: rollup
tgross35 added a commit to tgross35/rust that referenced this pull request Jul 21, 2024
@tgross35
Rollup merge of rust-lang#127985 - Oneirical:testibule-of-hell, r=Kobzol
3aa29ec 
Migrate `test-benches`, `c-unwind-abi-catch-panic` and `compiler-lookup-paths-2` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).
@tgross35 tgross35 mentioned this pull request Jul 21, 2024
Closed
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 21, 2024
@GuillaumeGomez
Rollup merge of rust-lang#127985 - Oneirical:testibule-of-hell, r=Kobzol
bbb94e7 
Migrate `test-benches`, `c-unwind-abi-catch-panic` and `compiler-lookup-paths-2` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jul 21, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 21, 2024
@bors
Auto merge of rust-lang#128030 - GuillaumeGomez:rollup-pp031e7, r=Gui…
8cd834e 
…llaumeGomez

Rollup of 7 pull requests

Successful merges:

 - rust-lang#126450 (Promote Mac Catalyst targets to Tier 2, and ship with rustup)
 - rust-lang#127177 (Distribute rustc_codegen_cranelift for arm64 macOS)
 - rust-lang#127583 (Deal with invalid UTF-8 from `gai_strerror`)
 - rust-lang#127977 (Update wasi-sdk in CI to latest release)
 - rust-lang#127985 (Migrate `test-benches`, `c-unwind-abi-catch-panic` and `compiler-lookup-paths-2` `run-make` tests to rmake)
 - rust-lang#128014 (Fix stab display in doc blocks)
 - rust-lang#128023 (rustdoc: short descriptions cause word-breaks in tables)

r? `@ghost`
`@rustbot` modify labels: rollup
@jieyouxu jieyouxu mentioned this pull request Jul 22, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 22, 2024
@bors
Auto merge of rust-lang#128056 - jieyouxu:rollup-zb1y27e, r=jieyouxu
aee3dc4 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#127177 (Distribute rustc_codegen_cranelift for arm64 macOS)
 - rust-lang#127415 (Add missing try_new_uninit_slice_in and try_new_zeroed_slice_in)
 - rust-lang#127510 (Rewrite `test-float-parse` in Rust)
 - rust-lang#127977 (Update wasi-sdk in CI to latest release)
 - rust-lang#127985 (Migrate `test-benches`, `c-unwind-abi-catch-panic` and `compiler-lookup-paths-2` `run-make` tests to rmake)
 - rust-lang#127996 (Clean up warnings + `unsafe_op_in_unsafe_fn` when building std for armv6k-nintendo-3ds)
 - rust-lang#128035 (Add test for rust-lang#125837)
 - rust-lang#128054 (mw triagebot vacation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5b915ab into rust-lang:master Jul 22, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Jul 22, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 22, 2024
@rust-timer
Unrolled build for rust-lang#127985
46a8c09 
Rollup merge of rust-lang#127985 - Oneirical:testibule-of-hell, r=Kobzol

Migrate `test-benches`, `c-unwind-abi-catch-panic` and `compiler-lookup-paths-2` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kobzol Kobzol Kobzol left review comments

Assignees

@Kobzol Kobzol

Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc 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)
Projects
Oxidizing run-make tests
Status: Done
Milestone
1.82.0
Development

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