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 tests/run-make/extern-flag-disambiguates to rmake #128099

Merged
merged 4 commits into from
Jul 26, 2024
Merged

migrate tests/run-make/extern-flag-disambiguates to rmake #128099

merged 4 commits into from
Jul 26, 2024

Conversation

lolbinarycat
Copy link
Contributor

No description provided.

@rustbot
Copy link
Collaborator

rustbot commented Jul 23, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @jieyouxu (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 23, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 23, 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

@lolbinarycat lolbinarycat mentioned this pull request Jul 23, 2024
Open
Kobzol
Kobzol reviewed Jul 23, 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.

Thank you!

You should also remove the ported test filename from allowed_run_make_makefiles.txt, see e.g. https://github.com/rust-lang/rust/pull/125988/files for an example.

tests/run-make/extern-flag-disambiguates/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/extern-flag-disambiguates/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/extern-flag-disambiguates/rmake.rs Outdated Show resolved Hide resolved
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol
Copy link
Contributor

Kobzol commented Jul 23, 2024

r? @Kobzol

@rustbot rustbot assigned Kobzol and unassigned jieyouxu Jul 23, 2024
@Oneirical
Copy link
Contributor

The job mingw-check-tidy failed! Check out the build log: (web) (plain)
Click to see the possible cause of the failure (guessed by this bot)

You'll also need to remove the test from src/tools/tidy/src/allowed_run_make_makefiles.txt so tidy is happy.

@jieyouxu
Copy link
Member

You'll also need to remove the test from src/tools/tidy/src/allowed_run_make_makefiles.txt so tidy is happy.

(./x test tidy --bless)

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jul 23, 2024
@lolbinarycat lolbinarycat force-pushed the extern-flag-disambiguates-rmake branch from 9cf175f to 4d22a0d Compare July 23, 2024 18:58
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol
Copy link
Contributor

Kobzol commented Jul 24, 2024

Thank you!

@bors r+

@bors
Copy link
Contributor

bors commented Jul 24, 2024

📌 Commit 6fd2ac4 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 24, 2024
@bors
Copy link
Contributor

bors commented Jul 25, 2024

☔ The latest upstream changes (presumably #128102) 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 Jul 25, 2024
@lolbinarycat lolbinarycat force-pushed the extern-flag-disambiguates-rmake branch from 6fd2ac4 to 62dff66 Compare July 25, 2024 16:20
@Kobzol
Copy link
Contributor

Kobzol commented Jul 25, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Jul 25, 2024

📌 Commit 62dff66 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 Jul 25, 2024
@tgross35 tgross35 mentioned this pull request Jul 26, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 26, 2024
@bors
Auto merge of rust-lang#128222 - tgross35:rollup-fk7qdo3, r=tgross35
83d6768 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#126575 (Make it crystal clear what lint `type_alias_bounds` actually signifies)
 - rust-lang#127017 (Extend rules of dead code analysis for impls for adts to impls for types refer to adts)
 - rust-lang#127523 (Migrate `dump-ice-to-disk` and `panic-abort-eh_frame` `run-make` tests to rmake)
 - rust-lang#127557 (Add a label to point to the lacking macro name definition)
 - rust-lang#127989 (Migrate `interdependent-c-libraries`, `compiler-rt-works-on-mingw` and `incr-foreign-head-span` `run-make` tests to rmake)
 - rust-lang#128099 (migrate tests/run-make/extern-flag-disambiguates to rmake)
 - rust-lang#128170 (Make Clone::clone a lang item)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0f1ea63 into rust-lang:master Jul 26, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Jul 26, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 26, 2024
@rust-timer
Unrolled build for rust-lang#128099
0cc163f 
Rollup merge of rust-lang#128099 - lolbinarycat:extern-flag-disambiguates-rmake, r=Kobzol

migrate tests/run-make/extern-flag-disambiguates to rmake
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

@jieyouxu jieyouxu jieyouxu left review comments

@Oneirical Oneirical Oneirical 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.
7 participants
@lolbinarycat @rustbot @rust-log-analyzer @Kobzol @Oneirical @jieyouxu @bors