Skip to content

Migrate run-make/issue-30063 to rmake#125227

Merged
bors merged 1 commit intorust-lang:masterfrom
Oneirical:seventh
May 23, 2024
Merged

Migrate run-make/issue-30063 to rmake#125227
bors merged 1 commit intorust-lang:masterfrom
Oneirical:seventh

Conversation

@Oneirical
Copy link
Contributor

@Oneirical Oneirical commented May 17, 2024

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

(Sorry about the inconvenience of all these PRs, this is the last one batched for today. I will discuss how we can cut these down a bit.)

The last check was previously commented out in the Makefile, and I have readded it. If it fails the CI, this can be reconsidered.

@rustbot
Copy link
Collaborator

rustbot commented May 17, 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-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 May 17, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 17, 2024

Some changes occurred in run-make tests.

cc @jieyouxu

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Oneirical Oneirical mentioned this pull request May 17, 2024
Merged
@rust-log-analyzer

This comment has been minimized.

Sign in to view
jieyouxu
jieyouxu reviewed May 17, 2024
View reviewed changes
tests/run-make/reset-codegen-1/rmake.rs Outdated
Comment on lines 3 to 4
// This test tries to reproduce this issue with varied emit flags - if it passes, the codegen-units
// are being appropriately reset to 1 after each pass.
Copy link
Member

@jieyouxu jieyouxu May 17, 2024

Choose a reason for hiding this comment

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

AFAICT, this isn't actually being checked. We're just checking here that foo.rs "compiles with various cli flags", am I understanding that correctly?

Copy link
Member

@jieyouxu jieyouxu May 17, 2024

Choose a reason for hiding this comment

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

As in, the original test also isn't checking what this comment is saying?

Copy link
Contributor Author

@Oneirical Oneirical May 21, 2024

Choose a reason for hiding this comment

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

You're right, I wrongfully assumed. The test is checking that the fix did not break compilation, not that the fix itself is doing what it is supposed to do (preventing the annoying re-compilation).

jieyouxu added a commit to jieyouxu/rust that referenced this pull request May 17, 2024
@jieyouxu
Rollup merge of rust-lang#125215 - Oneirical:easy-test-the-second, r=…
d7498c2 
…jieyouxu

Migrate `run-make/issue64319` to `rmake` and rename

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).

~~I noticed that the Makefile was not listed in `allowed-run-makefiles` in Tidy. Does this mean the test was being ignored?~~ EDIT: No, it was there, just not in its expected alphabetical order.

EDIT2: Perhaps it could be interesting to clean this test visually by looping over the `rustc` calls, like in rust-lang#125227.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 18, 2024
@rust-timer
Unrolled build for rust-lang#125215
6ae3612 
Rollup merge of rust-lang#125215 - Oneirical:easy-test-the-second, r=jieyouxu

Migrate `run-make/issue64319` to `rmake` and rename

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).

~~I noticed that the Makefile was not listed in `allowed-run-makefiles` in Tidy. Does this mean the test was being ignored?~~ EDIT: No, it was there, just not in its expected alphabetical order.

EDIT2: Perhaps it could be interesting to clean this test visually by looping over the `rustc` calls, like in rust-lang#125227.
@bors
Copy link
Collaborator

bors commented May 18, 2024

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

@jieyouxu jieyouxu mentioned this pull request May 20, 2024
Closed
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Oneirical Oneirical mentioned this pull request May 21, 2024
Merged
jieyouxu
jieyouxu reviewed May 21, 2024
View reviewed changes
@jieyouxu
Copy link
Member

jieyouxu commented May 21, 2024

@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 May 21, 2024
@Oneirical
Copy link
Contributor Author

Oneirical commented May 22, 2024

Revisions made.

@rustbot review

@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 May 22, 2024
@jieyouxu
Copy link
Member

jieyouxu commented May 22, 2024

Thanks, r=me after squashing commits into one.
@bors delegate+

@bors
Copy link
Collaborator

bors commented May 22, 2024

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

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

@Oneirical
Copy link
Contributor Author

Oneirical commented May 22, 2024

@bors r=@jieyouxu

@bors
Copy link
Collaborator

bors commented May 22, 2024

📌 Commit f377ea1 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 May 22, 2024
@jieyouxu
Copy link
Member

jieyouxu commented May 23, 2024

@bors rollup

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 23, 2024
@matthiaskrgr
Rollup merge of rust-lang#125227 - Oneirical:seventh, r=jieyouxu
ef035c1 
Migrate `run-make/issue-30063` 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).

(Sorry about the [inconvenience](rust-lang#125224 (comment)) of all these PRs, this is the last one batched for today. I will discuss how we can cut these down a bit.)

The last check was previously commented out in the Makefile, and I have readded it. If it fails the CI, this can be reconsidered.
@matthiaskrgr matthiaskrgr mentioned this pull request May 23, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request May 23, 2024
@bors
Auto merge of rust-lang#125437 - matthiaskrgr:rollup-v3xfs1n, r=matth…
fc13581 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#125165 (Migrate `run-make/pgo-branch-weights` to `rmake`)
 - rust-lang#125210 (Cleanup: Fix up some diagnostics)
 - rust-lang#125224 (Migrate `run-make/issue-53964` to `rmake`)
 - rust-lang#125227 (Migrate `run-make/issue-30063` to `rmake`)
 - rust-lang#125383 (Rewrite `emit`, `mixing-formats` and `bare-outfile` `run-make` tests in `rmake.rs` format)
 - rust-lang#125401 (Migrate `run-make/rustdoc-scrape-examples-macros` to `rmake.rs`)
 - rust-lang#125409 (Rename `FrameworkOnlyWindows` to `RawDylibOnlyWindows`)
 - rust-lang#125416 (Use correct param-env in `MissingCopyImplementations`)
 - rust-lang#125421 (Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 23, 2024
@matthiaskrgr
Rollup merge of rust-lang#125227 - Oneirical:seventh, r=jieyouxu
32da869 
Migrate `run-make/issue-30063` 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).

(Sorry about the [inconvenience](rust-lang#125224 (comment)) of all these PRs, this is the last one batched for today. I will discuss how we can cut these down a bit.)

The last check was previously commented out in the Makefile, and I have readded it. If it fails the CI, this can be reconsidered.
@matthiaskrgr matthiaskrgr mentioned this pull request May 23, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request May 23, 2024
@bors
Auto merge of rust-lang#125444 - matthiaskrgr:rollup-379ukwx, r=matth…
4f2dc04 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#125210 (Cleanup: Fix up some diagnostics)
 - rust-lang#125224 (Migrate `run-make/issue-53964` to `rmake`)
 - rust-lang#125227 (Migrate `run-make/issue-30063` to `rmake`)
 - rust-lang#125383 (Rewrite `emit`, `mixing-formats` and `bare-outfile` `run-make` tests in `rmake.rs` format)
 - rust-lang#125401 (Migrate `run-make/rustdoc-scrape-examples-macros` to `rmake.rs`)
 - rust-lang#125409 (Rename `FrameworkOnlyWindows` to `RawDylibOnlyWindows`)
 - rust-lang#125416 (Use correct param-env in `MissingCopyImplementations`)
 - rust-lang#125421 (Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format)
 - rust-lang#125438 (Remove unneeded string conversion)

r? `@ghost`
`@rustbot` modify labels: rollup
@fmease fmease mentioned this pull request May 23, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 23, 2024
@bors
Auto merge of rust-lang#125456 - fmease:rollup-n8608gc, r=fmease
5baee04 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#122382 (Detect unused structs which implement private traits)
 - rust-lang#124389 (Add a warning to proc_macro::Delimiter::None that rustc currently does not respect it.)
 - rust-lang#125224 (Migrate `run-make/issue-53964` to `rmake`)
 - rust-lang#125227 (Migrate `run-make/issue-30063` to `rmake`)
 - rust-lang#125336 (Add dedicated definition for intrinsics)
 - rust-lang#125401 (Migrate `run-make/rustdoc-scrape-examples-macros` to `rmake.rs`)
 - rust-lang#125454 (Improve the doc of query associated_item)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d392d68 into rust-lang:master May 23, 2024
@rustbot rustbot added this to the 1.80.0 milestone May 23, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 23, 2024
@rust-timer
Unrolled build for rust-lang#125227
3ad75a6 
Rollup merge of rust-lang#125227 - Oneirical:seventh, r=jieyouxu

Migrate `run-make/issue-30063` 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).

(Sorry about the [inconvenience](rust-lang#125224 (comment)) of all these PRs, this is the last one batched for today. I will discuss how we can cut these down a bit.)

The last check was previously commented out in the Makefile, and I have readded it. If it fails the CI, this can be reconsidered.
@Oneirical Oneirical deleted the seventh branch May 30, 2024 18:35
@jieyouxu jieyouxu mentioned this pull request Jun 5, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jieyouxu jieyouxu jieyouxu left review comments

Assignees

@jieyouxu jieyouxu

Labels

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

No open projects
Oxidizing run-make tests
Status: Done

Milestone

1.80.0

Development

Successfully merging this pull request may close these issues.

5 participants

@Oneirical @rustbot @rust-log-analyzer @bors @jieyouxu