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.

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

Migrate run make const fn mir #126270

Merged
merged 3 commits into from
Jun 14, 2024

Conversation

GuillaumeGomez
Copy link
Member

Part of #121876.

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

rustbot commented Jun 11, 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

The run-make-support library was changed

cc @jieyouxu

Comment on lines +103 to +109
// If we can bless (meaning we have a file to write into and the `RUSTC_BLESS_TEST`
// environment variable set), then we write into the file and return.
Copy link
Member

Choose a reason for hiding this comment

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

I'll take note to also write this into the support library docs, we probably also should document this in rustc-dev-guide for run-make tests?

Copy link
Member Author

Choose a reason for hiding this comment

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

I suppose so. Didn't know there was a guide. ^^'

tests/run-make/const_fn_mir/rmake.rs Outdated Show resolved Hide resolved
@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 Jun 12, 2024
@GuillaumeGomez
Copy link
Member Author

For the dev guide, I'll need to send a PR to the target repository so nothing I can do here directly. Applied suggestion for the test.

@bors ready

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, just one suggestion about using fs_wrapper, then r=me after CI is green.

(Also bors doesn't know about ready, only rustbot does 😆)

src/tools/run-make-support/src/diff/mod.rs Outdated Show resolved Hide resolved
@GuillaumeGomez
Copy link
Member Author

(Also bors doesn't know about ready, only rustbot does 😆)

Too many bots. 😅

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.

Looks good!

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez
Copy link
Member Author

Not sure why it failed in the GCC backend. Rebased, let's see if it's happy now.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez
Copy link
Member Author

@bors r=jieyouxu rollup

@bors
Copy link
Contributor

bors commented Jun 13, 2024

📌 Commit 5f4111f 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 Jun 13, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 13, 2024
…nst_fn_mir, r=jieyouxu

Migrate run make const fn mir

Part of rust-lang#121876.

r? `@jieyouxu`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 14, 2024
…nst_fn_mir, r=jieyouxu

Migrate run make const fn mir

Part of rust-lang#121876.

r? ``@jieyouxu``
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 14, 2024
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#123962 (change method resolution to constrain hidden types instead of rejecting method candidates)
 - rust-lang#124884 (place explicit lifetime bound after generic param)
 - rust-lang#126244 (Update fuchsia commit, and SDK to 21.20240610.2.1)
 - rust-lang#126270 (Migrate run make const fn mir)
 - rust-lang#126320 (Avoid ICES after reporting errors on erroneous patterns)
 - rust-lang#126343 (Remove some msys2 utils)
 - rust-lang#126351 (std::unix::fs::link using direct linkat call for Solaris.)
 - rust-lang#126368 (Remove some unnecessary crate dependencies.)
 - rust-lang#126386 (Migrate `run-make/allow-non-lint-warnings-cmdline` to `rmake.rs`)
 - rust-lang#126449 (Fill out missing Windows support information)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 14, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#123962 (change method resolution to constrain hidden types instead of rejecting method candidates)
 - rust-lang#126244 (Update fuchsia commit, and SDK to 21.20240610.2.1)
 - rust-lang#126270 (Migrate run make const fn mir)
 - rust-lang#126320 (Avoid ICES after reporting errors on erroneous patterns)
 - rust-lang#126449 (Fill out missing Windows support information)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 254f10a into rust-lang:master Jun 14, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 14, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 14, 2024
Rollup merge of rust-lang#126270 - GuillaumeGomez:migrate-run-make-const_fn_mir, r=jieyouxu

Migrate run make const fn mir

Part of rust-lang#121876.

r? ```@jieyouxu```
@GuillaumeGomez GuillaumeGomez deleted the migrate-run-make-const_fn_mir branch June 14, 2024 09:20
@@ -0,0 +1,8 @@
// The `needs-unwind -Cpanic=abort` gives a different MIR output.
Copy link
Member

Choose a reason for hiding this comment

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

This should have been //@ needs-unwind. # needs-unwind in Makefile tests ignores the test when -Cpanic=abort is the default, like with cg_clif or when compiling for wasm.

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

Sorry, fixing it and reverting your mir changes as well.

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 17, 2024
…ion, r=bjorn3

Add `run-make/const_fn_mir` missing test annotation

Fixes comment from rust-lang#126270.

r? `@bjorn3`
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 17, 2024
Rollup merge of rust-lang#126580 - GuillaumeGomez:add-missing-annotation, r=bjorn3

Add `run-make/const_fn_mir` missing test annotation

Fixes comment from rust-lang#126270.

r? `@bjorn3`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Status: Done
Development

Successfully merging this pull request may close these issues.

7 participants