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 run-make/override-aliased-flags to rmake.rs #127041

Merged
merged 1 commit into from
Jun 29, 2024
Merged

Migrate run-make/override-aliased-flags to rmake.rs #127041

merged 1 commit into from
Jun 29, 2024

Conversation

GuillaumeGomez
Copy link
Member

Part of #121876.

I voluntarily didn't use the helper methods to make it obvious what's tested.

r? @jieyouxu

@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 Jun 27, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 27, 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 Jun 27, 2024
Open
Kobzol
Kobzol reviewed Jun 27, 2024
View reviewed changes
Copy link
Contributor

@Kobzol Kobzol left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I guess it's not that difficult to check if optimizations or debuginfo was applied (see e.g. the debug-assertions test). But if you want to keep it like it was, fine by me (feel free to r=me in that case).

@Kobzol
Copy link
Contributor

Kobzol commented Jun 27, 2024

r? @Kobzol

@rustbot rustbot assigned Kobzol and unassigned jieyouxu Jun 27, 2024
@GuillaumeGomez
Copy link
Member Author

I think it's better this way. As always, can be revisited at a later time.

@bors r=Kobzol rollup

@bors
Copy link
Contributor

bors commented Jun 27, 2024

📌 Commit ae64514 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 Jun 27, 2024
jhpratt added a commit to jhpratt/rust that referenced this pull request Jun 28, 2024
@jhpratt
Rollup merge of rust-lang#127041 - GuillaumeGomez:run-make-override-a…
0c54d77 
…liased-flags, r=Kobzol

Migrate `run-make/override-aliased-flags` to `rmake.rs`

Part of rust-lang#121876.

I voluntarily didn't use the helper methods to make it obvious what's tested.

r? `@jieyouxu`
@jhpratt jhpratt mentioned this pull request Jun 28, 2024
Closed
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 28, 2024
@GuillaumeGomez
Rollup merge of rust-lang#127041 - GuillaumeGomez:run-make-override-a…
15b0f7e 
…liased-flags, r=Kobzol

Migrate `run-make/override-aliased-flags` to `rmake.rs`

Part of rust-lang#121876.

I voluntarily didn't use the helper methods to make it obvious what's tested.

r? ``@jieyouxu``
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jun 28, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 28, 2024
@bors
Auto merge of rust-lang#127079 - GuillaumeGomez:rollup-ciimias, r=Gui…
99b441a 
…llaumeGomez

Rollup of 10 pull requests

Successful merges:

 - rust-lang#123714 (Add test for fn pointer duplication.)
 - rust-lang#124091 (Update AST validation module docs)
 - rust-lang#126963 (Add basic Serde serialization capabilities to Stable MIR)
 - rust-lang#127015 (Switch back `non_local_definitions` lint to allow-by-default)
 - rust-lang#127016 (docs: check if the disambiguator matches its suffix)
 - rust-lang#127029 (Fix Markdown tables in platform-support.md)
 - rust-lang#127032 (Enable const casting for `f16` and `f128`)
 - rust-lang#127041 (Migrate `run-make/override-aliased-flags` to `rmake.rs`)
 - rust-lang#127045 (Rename `super_predicates_of` and similar queries to `explicit_*` to note that they're not elaborated)
 - rust-lang#127075 (rustc_data_structures: Explicitly check for 64-bit atomics support)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Jun 28, 2024

☔ The latest upstream changes (presumably #127000) made this pull request unmergeable. Please resolve the merge conflicts.

@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 Jun 28, 2024
@GuillaumeGomez GuillaumeGomez force-pushed the run-make-override-aliased-flags branch from ae64514 to 4ee077a Compare June 29, 2024 09:55
@Kobzol
Copy link
Contributor

Kobzol commented Jun 29, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Jun 29, 2024

📌 Commit 4ee077a 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 29, 2024
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jun 29, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 29, 2024
@bors
Auto merge of rust-lang#127121 - GuillaumeGomez:rollup-xjjjckn, r=Gui…
19a1d2b 
…llaumeGomez

Rollup of 7 pull requests

Successful merges:

 - rust-lang#126805 (Migrate `pdb-alt-path`, `mismatching-target-triples` and `mingw-export-call-convention` `run-make` tests to rmake)
 - rust-lang#126995 (Migrate `pretty-print-with-dep-file`, `pretty-print-to-file` and `libtest-padding` `run-make` tests to rmake)
 - rust-lang#127041 (Migrate `run-make/override-aliased-flags` to `rmake.rs`)
 - rust-lang#127072 (docs: say "includes" instead of "does include")
 - rust-lang#127073 (Remove unnecessary SeqCst in `impl fmt::Pointer for AtomicPtr`)
 - rust-lang#127112 (Bootstrap: Don't get output if `lldb --version` errors)
 - rust-lang#127116 (Migrate `run-make/return-non-c-like-enum` to `rmake.rs`)

Failed merges:

 - rust-lang#127050 (Make mtime of reproducible tarballs dependent on git commit)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c1fb4e5 into rust-lang:master Jun 29, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 29, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 29, 2024
@rust-timer
Unrolled build for rust-lang#127041
d3acadf 
Rollup merge of rust-lang#127041 - GuillaumeGomez:run-make-override-aliased-flags, r=Kobzol

Migrate `run-make/override-aliased-flags` to `rmake.rs`

Part of rust-lang#121876.

I voluntarily didn't use the helper methods to make it obvious what's tested.

r? `@jieyouxu`
@GuillaumeGomez GuillaumeGomez deleted the run-make-override-aliased-flags branch June 29, 2024 17:53
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.81.0
Development

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