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 run-make/c-link-to-rust-dylib to rmake.rs #125808

Merged
merged 2 commits into from
Jun 3, 2024
Merged

Migrate run-make/c-link-to-rust-dylib to rmake.rs #125808

merged 2 commits into from
Jun 3, 2024

Conversation

GuillaumeGomez
Copy link
Member

Part of #121876.

First commit comes from #125773.

r? @jieyouxu

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

rustbot commented May 31, 2024

The run-make-support library was changed

cc @jieyouxu

Some changes occurred in run-make tests.

cc @jieyouxu

@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 31, 2024
@jieyouxu jieyouxu mentioned this pull request May 31, 2024
Open
@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-c-link-to-rust-dylib branch from 8f14111 to 57ca594 Compare May 31, 2024 12:00
jieyouxu
jieyouxu approved these changes May 31, 2024
View reviewed changes
src/tools/run-make-support/src/lib.rs
}
}

pub fn dynamic_lib_extension() -> &'static str {
Copy link
Contributor

Choose a reason for hiding this comment

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

Not-a-review-comment: I am always paranoid about these extensions, I feel like there's almost always edge cases I'm missing

tests/run-make/c-link-to-rust-dylib/rmake.rs Outdated Show resolved Hide resolved
@jieyouxu
Copy link
Contributor

Thanks, changes look good, r=me after CI is green

@GuillaumeGomez
Copy link
Member Author

@bors r=jieyouxu rollup

@bors
Copy link
Contributor

bors commented May 31, 2024

📌 Commit 57ca594 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 May 31, 2024
jieyouxu added a commit to jieyouxu/rust that referenced this pull request May 31, 2024
@jieyouxu
Rollup merge of rust-lang#125808 - GuillaumeGomez:migrate-run-make-c-…
6b6d5f2 
…link-to-rust-dylib, r=jieyouxu

Migrate `run-make/c-link-to-rust-dylib` to `rmake.rs`

Part of rust-lang#121876.

First commit comes from rust-lang#125773.

r? `@jieyouxu`
@jieyouxu jieyouxu mentioned this pull request May 31, 2024
Closed
@matthiaskrgr
Copy link
Member

@bors r-
tidy failed here: #125820 (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 May 31, 2024
@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-c-link-to-rust-dylib branch from 57ca594 to ef4f8e6 Compare June 1, 2024 08:11
@GuillaumeGomez
Copy link
Member Author

Fixed formatting.

@GuillaumeGomez
Copy link
Member Author

@bors r=jieyouxu

@bors
Copy link
Contributor

bors commented Jun 1, 2024

📌 Commit ef4f8e6 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 1, 2024
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 1, 2024
@GuillaumeGomez
Rollup merge of rust-lang#125808 - GuillaumeGomez:migrate-run-make-c-…
a93557f 
…link-to-rust-dylib, r=jieyouxu

Migrate `run-make/c-link-to-rust-dylib` to `rmake.rs`

Part of rust-lang#121876.

First commit comes from rust-lang#125773.

r? `@jieyouxu`
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jun 1, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 1, 2024
@bors
Auto merge of rust-lang#125848 - GuillaumeGomez:rollup-jfjee06, r=Gui…
ab1d67f 
…llaumeGomez

Rollup of 4 pull requests

Successful merges:

 - rust-lang#124577 (Stabilize `custom_code_classes_in_docs` feature)
 - rust-lang#125683 (Rewrite `suspicious-library`, `resolve-rename` and `incr-prev-body-beyond-eof` `run-make` tests in `rmake.rs` format)
 - rust-lang#125773 (Migrate run make cdylib)
 - rust-lang#125808 (Migrate `run-make/c-link-to-rust-dylib` to `rmake.rs`)

r? `@ghost`
`@rustbot` modify labels: rollup
@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-c-link-to-rust-dylib branch from ab0fc6e to 32933a6 Compare June 2, 2024 10:04
@GuillaumeGomez
Copy link
Member Author

All libs should now be removed as expected.

jieyouxu
jieyouxu approved these changes Jun 2, 2024
View reviewed changes
Copy link
Contributor

@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! r=me after CI is 💚.

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-c-link-to-rust-dylib branch from 32933a6 to 050ff9c Compare June 2, 2024 11:13
@rustbot
Copy link
Collaborator

rustbot commented Jun 2, 2024

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-c-link-to-rust-dylib branch from 050ff9c to 32933a6 Compare June 2, 2024 11:14
@GuillaumeGomez
Copy link
Member Author

@bors r=jieyouxu rollup

@bors
Copy link
Contributor

bors commented Jun 2, 2024

📌 Commit 32933a6 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 2, 2024
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 2, 2024
@jieyouxu
Rollup merge of rust-lang#125808 - GuillaumeGomez:migrate-run-make-c-…
78e8ca4 
…link-to-rust-dylib, r=jieyouxu

Migrate `run-make/c-link-to-rust-dylib` to `rmake.rs`

Part of rust-lang#121876.

First commit comes from rust-lang#125773.

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
Contributor

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
@workingjubilee
Copy link
Contributor

Wait, this is the other PR, sorry.
@bors r=jieyouxu

@bors
Copy link
Contributor

bors commented Jun 2, 2024

📌 Commit 32933a6 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 2, 2024
@workingjubilee workingjubilee mentioned this pull request Jun 2, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2024
@bors
Auto merge of rust-lang#125902 - workingjubilee:rollup-f8x6iif, r=wor…
032af18 
…kingjubilee

Rollup of 6 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#125884 (Implement feature `integer_sign_cast`)
 - rust-lang#125890 (Improve compiletest expected/not found formatting)
 - rust-lang#125896 (compiletest: fix outdated rmake.rs comment)
 - rust-lang#125898 (typo: depending from -> on)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 800b2f8 into rust-lang:master Jun 3, 2024
12 checks passed
@rustbot rustbot added this to the 1.80.0 milestone Jun 3, 2024
@bors
Copy link
Contributor

bors commented Jun 3, 2024

⌛ Testing commit 32933a6 with merge 032af18...

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 3, 2024
@rust-timer
Unrolled build for rust-lang#125808
f51a06b 
Rollup merge of rust-lang#125808 - GuillaumeGomez:migrate-run-make-c-link-to-rust-dylib, r=jieyouxu

Migrate `run-make/c-link-to-rust-dylib` to `rmake.rs`

Part of rust-lang#121876.

First commit comes from rust-lang#125773.

r? `@jieyouxu`
@workingjubilee
Copy link
Contributor

@bors r-

@GuillaumeGomez GuillaumeGomez deleted the migrate-run-make-c-link-to-rust-dylib branch June 3, 2024 07:27
@jieyouxu jieyouxu mentioned this pull request Jun 9, 2024
Open
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-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.80.0
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@GuillaumeGomez @rustbot @jieyouxu @bors @matthiaskrgr @rust-log-analyzer @workingjubilee