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 error-found-staticlib-instead-crate, output-filename-conflicts-with-directory, output-filename-overwrites-input, native-link-modifier-verbatim-rustc and native-link-verbatim-linker run-make tests to rmake.rs format #126500

Merged
merged 5 commits into from
Jun 18, 2024
Merged

Migrate error-found-staticlib-instead-crate, output-filename-conflicts-with-directory, output-filename-overwrites-input, native-link-modifier-verbatim-rustc and native-link-verbatim-linker run-make tests to rmake.rs format #126500

merged 5 commits into from
Jun 18, 2024

Conversation

Oneirical
Copy link
Contributor

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

@rustbot
Copy link
Collaborator

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

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol Kobzol changed the title Migrate error-found-staticlib-instead-crate, output-filename-conflicts-with-directory, output-filename-overwrites-input, native-link-modifier-verbatim-rustc and native-link-modifier-linker run-make tests to rmake.rs format Migrate error-found-staticlib-instead-crate, output-filename-conflicts-with-directory, output-filename-overwrites-input, native-link-modifier-verbatim-rustc and native-link-verbatim-linker run-make tests to rmake.rs format Jun 14, 2024
@Kobzol Kobzol mentioned this pull request Jun 14, 2024
Open
jieyouxu
jieyouxu approved these changes Jun 16, 2024
View reviewed changes
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! LGTM but needs a ./x fmt, r=me after that.

ferrisOwOYeah_286x100

@jieyouxu
Copy link
Member

@bors delegate+

@bors
Copy link
Contributor

bors commented Jun 16, 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

@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 16, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Oneirical
Copy link
Contributor Author

@bors r=@jieyouxu

@bors
Copy link
Contributor

bors commented Jun 17, 2024

📌 Commit eab1c81 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 17, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 17, 2024
@matthiaskrgr
Rollup merge of rust-lang#126500 - Oneirical:test-for-the-holy-grail,…
efb8a07 
… r=jieyouxu

Migrate `error-found-staticlib-instead-crate`, `output-filename-conflicts-with-directory`, `output-filename-overwrites-input`, `native-link-modifier-verbatim-rustc` and `native-link-verbatim-linker` `run-make` tests to `rmake.rs` format

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 Jun 17, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 17, 2024
@bors
Auto merge of rust-lang#126602 - matthiaskrgr:rollup-fdiiow4, r=matth…
ceddc11 
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#126500 (Migrate `error-found-staticlib-instead-crate`, `output-filename-conflicts-with-directory`, `output-filename-overwrites-input`, `native-link-modifier-verbatim-rustc` and `native-link-verbatim-linker` `run-make` tests to `rmake.rs` format)
 - rust-lang#126567 (Rename `InstanceDef` -> `InstanceKind`)
 - rust-lang#126579 (Fix broken documentation link)
 - rust-lang#126596 (Add tracking issue number to async_drop APIs)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr
Copy link
Member

@bors r-
#126602 (comment)

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

So, there was an //@ ignore-apple in the original test, which I removed because I wanted to run bors try to learn the reason, and then I forgot it was gone.
At least, we know the reason now, but from now on, when I test why these ignores exist, it should be included in the PR description or a comment.

@jieyouxu
Copy link
Member

Thanks, r=me after CI is green.

@Oneirical
Copy link
Contributor Author

@bors r=@jieyouxu

@bors
Copy link
Contributor

bors commented Jun 17, 2024

📌 Commit 6fffe84 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 17, 2024
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 17, 2024
@jieyouxu
Rollup merge of rust-lang#126500 - Oneirical:test-for-the-holy-grail,…
7f5442e 
… r=jieyouxu

Migrate `error-found-staticlib-instead-crate`, `output-filename-conflicts-with-directory`, `output-filename-overwrites-input`, `native-link-modifier-verbatim-rustc` and `native-link-verbatim-linker` `run-make` tests to `rmake.rs` format

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).
@jieyouxu jieyouxu mentioned this pull request Jun 17, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 17, 2024
@bors
Auto merge of rust-lang#126611 - jieyouxu:rollup-061kmhl, r=jieyouxu
cb74cba 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#126279 (Migrate `inaccessible-temp-dir`, `output-with-hyphens` and `issue-10971-temps-dir` `run-make` tests to `rmake`)
 - rust-lang#126437 (Migrate `issue-64153`, `invalid-staticlib` and `no-builtins-lto` `run-make` tests to `rmake`)
 - rust-lang#126490 (Migrate `extern-flag-fun`, `incremental-debugger-visualiser` and `incremental-session-fail` `run-make` tests to `rmake.rs`)
 - rust-lang#126500 (Migrate `error-found-staticlib-instead-crate`, `output-filename-conflicts-with-directory`, `output-filename-overwrites-input`, `native-link-modifier-verbatim-rustc` and `native-link-verbatim-linker` `run-make` tests to `rmake.rs` format)
 - rust-lang#126534 (Migrate `run-make/comment-section` to `rmake.rs`)

r? `@ghost`
`@rustbot` modify labels: rollup
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jun 18, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 18, 2024
@bors
Auto merge of rust-lang#126630 - GuillaumeGomez:rollup-hlwbpa2, r=Gui…
8814b92 
…llaumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#125988 (Migrate `run-make/used` to `rmake.rs`)
 - rust-lang#126500 (Migrate `error-found-staticlib-instead-crate`, `output-filename-conflicts-with-directory`, `output-filename-overwrites-input`, `native-link-modifier-verbatim-rustc` and `native-link-verbatim-linker` `run-make` tests to `rmake.rs` format)
 - rust-lang#126583 (interpret: better error when we ran out of memory)
 - rust-lang#126587 (coverage: Add debugging flag `-Zcoverage-options=no-mir-spans`)
 - rust-lang#126621 (More thorough status-quo tests for `#[coverage(..)]`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6b9bcdc into rust-lang:master Jun 18, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 18, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 18, 2024
@rust-timer
Unrolled build for rust-lang#126500
ee11028 
Rollup merge of rust-lang#126500 - Oneirical:test-for-the-holy-grail, r=jieyouxu

Migrate `error-found-staticlib-instead-crate`, `output-filename-conflicts-with-directory`, `output-filename-overwrites-input`, `native-link-modifier-verbatim-rustc` and `native-link-verbatim-linker` `run-make` tests to `rmake.rs` format

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).
@Oneirical Oneirical deleted the test-for-the-holy-grail branch June 18, 2024 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

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