Skip to content

Migrate run make issue 15460 #125886

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 4 commits into from
Jul 23, 2024
Merged

Migrate run make issue 15460 #125886

merged 4 commits into from
Jul 23, 2024

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Jun 2, 2024 •
edited by jieyouxu
Loading

Part of #121876.

r? @jieyouxu

try-job: x86_64-msvc
try-job: aarch64-apple
try-job: x86_64-gnu-llvm-18

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

rustbot commented Jun 2, 2024

The run-make-support library was changed

cc @jieyouxu

Some changes occurred in run-make tests.

cc @jieyouxu

Some changes occurred in src/tools/compiletest

cc @jieyouxu

jieyouxu
jieyouxu reviewed Jun 2, 2024
View reviewed changes
@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-issue-15460 branch from 32edd4e to 60f237b Compare June 2, 2024 10:15
jieyouxu
jieyouxu reviewed Jun 2, 2024
View reviewed changes
@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-issue-15460 branch from 60f237b to 30cd434 Compare June 2, 2024 11:04
@GuillaumeGomez
Copy link
Member Author

build_native_static_lib now returns the path.

jieyouxu
jieyouxu reviewed Jun 2, 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, just one omission and then r=me after CI is green.

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-issue-15460 branch from 30cd434 to 050ff9c Compare June 2, 2024 11:14
@GuillaumeGomez
Copy link
Member Author

Added missing track_caller.

jieyouxu
jieyouxu reviewed Jun 2, 2024
View reviewed changes
@GuillaumeGomez
Copy link
Member Author

@bors r=jieyouxu rollup

@bors
Copy link
Collaborator

bors commented Jun 2, 2024

📌 Commit 36aba94 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 Jun 2, 2024
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 2, 2024
@jieyouxu
Rollup merge of rust-lang#125886 - GuillaumeGomez:migrate-run-make-is…
8d471c8 
…sue-15460, r=jieyouxu

Migrate run make issue 15460

Part of rust-lang#121876.

r? `@jieyouxu`
@jieyouxu jieyouxu mentioned this pull request Jun 2, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2024
@bors
Auto merge of rust-lang#125899 - jieyouxu:rollup-edk4see, r=jieyouxu
f8e81b3 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#121062 (Change f32::midpoint to upcast to f64)
 - rust-lang#125808 (Migrate `run-make/c-link-to-rust-dylib` to `rmake.rs`)
 - rust-lang#125886 (Migrate run make issue 15460)
 - rust-lang#125890 (Improve compiletest expected/not found formatting)
 - rust-lang#125896 (compiletest: fix outdated rmake.rs comment)

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

Died in #125899 (comment)

@bors rollup=iffy r-

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

jieyouxu commented Jun 3, 2024

Not for this PR, but we should add a env var helper that actually reports which env var isn't present...

@GuillaumeGomez
Copy link
Member Author

It's not for this PR indeed. Re-approving it.

@bors r=jieyouxu rollup

@bors
Copy link
Collaborator

bors commented Jun 3, 2024

📌 Commit 36aba94 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 3, 2024
@GuillaumeGomez
Copy link
Member Author

@bors try

@bors
Copy link
Collaborator

bors commented Jul 22, 2024

⌛ Trying commit 7ad48c7 with merge 3df2450...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 22, 2024
@bors
Auto merge of rust-lang#125886 - GuillaumeGomez:migrate-run-make-issu…
3df2450 
…e-15460, r=<try>

Migrate run make issue 15460

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: x86_64-msvc
@rust-log-analyzer

This comment has been minimized.

# to view
@jieyouxu

This comment was marked as resolved.

# to view
@jieyouxu
Copy link
Member

Actually, 33c4a6f looks like a messed up rebase?

@bors
Copy link
Collaborator

bors commented Jul 22, 2024

☀️ Try build successful - checks-actions
Build commit: 3df2450 (3df2450e3a539240748cb2d96ce9011e14f3a9f2)

@jieyouxu

This comment was marked as outdated.

# to view
@jieyouxu
Copy link
Member

@bors try (please be sane)

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 22, 2024
@bors
Auto merge of rust-lang#125886 - GuillaumeGomez:migrate-run-make-issu…
90029d3 
…e-15460, r=<try>

Migrate run make issue 15460

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: x86_64-msvc
try-job: aarch64-apple
try-job: x86_64-gnu-llvm-18
@bors
Copy link
Collaborator

bors commented Jul 22, 2024

⌛ Trying commit 7ad48c7 with merge 90029d3...

@bors
Copy link
Collaborator

bors commented Jul 22, 2024

☀️ Try build successful - checks-actions
Build commit: 90029d3 (90029d39c1b0f480a15b91b1da8b0ed86519cf69)

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-issue-15460 branch from 7ad48c7 to 1671460 Compare July 22, 2024 21:23
@GuillaumeGomez
Copy link
Member Author

Fixed the merge conflict, try is happy. I think it's finally ready for merge. :D

jieyouxu
jieyouxu approved these changes Jul 22, 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.

Just a comment nit, r=me after that

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-issue-15460 branch from 1671460 to 3de5252 Compare July 23, 2024 09:47
@GuillaumeGomez
Copy link
Member Author

Finally! \o/

@bors r=jieyouxu

@bors
Copy link
Collaborator

bors commented Jul 23, 2024

📌 Commit 3de5252 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 Jul 23, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 23, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 23, 2024
@bors
Auto merge of rust-lang#128109 - matthiaskrgr:rollup-gc7kopi, r=matth…
8bfcae7 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#125886 (Migrate run make issue 15460)
 - rust-lang#126898 (Migrate `run-make/link-framework` to `rmake.rs`)
 - rust-lang#126994 (Support lists and stylings in more places for `rustc --explain`)
 - rust-lang#127990 (Migrate `lto-linkage-used-attr`, `no-duplicate-libs` and `pgo-gen-no-imp-symbols` `run-make` tests to rmake)
 - rust-lang#128060 (Fix inclusion of `wasm-component-ld` in dist artifacts)
 - rust-lang#128082 (Note closure captures when reporting cast to fn ptr failed)
 - rust-lang#128098 (make it possible to disable download-rustc if it's incompatible)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9d4daf8 into rust-lang:master Jul 23, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Jul 23, 2024
@GuillaumeGomez GuillaumeGomez deleted the migrate-run-make-issue-15460 branch July 23, 2024 22:07
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 23, 2024
@rust-timer
Unrolled build for rust-lang#125886
c3fc9a9 
Rollup merge of rust-lang#125886 - GuillaumeGomez:migrate-run-make-issue-15460, r=jieyouxu

Migrate run make issue 15460

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: x86_64-msvc
try-job: aarch64-apple
try-job: x86_64-gnu-llvm-18
# for free to join this conversation on GitHub. Already have an account? # 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
No open projects
Oxidizing run-make tests
Status: Done
Milestone
1.82.0
Development

Successfully merging this pull request may close these issues.
7 participants
@GuillaumeGomez @rustbot @bors @workingjubilee @jieyouxu @rust-log-analyzer @Kobzol