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 cdylib #125773

Merged
merged 2 commits into from
Jun 2, 2024
Merged

Migrate run make cdylib #125773

merged 2 commits into from
Jun 2, 2024

Conversation

GuillaumeGomez
Copy link
Member

Part of #121876.

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

rustbot commented May 30, 2024

The run-make-support library was changed

cc @jieyouxu

Some changes occurred in run-make tests.

cc @jieyouxu

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez GuillaumeGomez mentioned this pull request May 31, 2024
Merged
jieyouxu
jieyouxu approved these changes May 31, 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! Looks good in general, just left some suggestions.

tests/run-make/cdylib/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/cdylib/rmake.rs Outdated Show resolved Hide resolved
@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 May 31, 2024
@GuillaumeGomez
Copy link
Member Author

@bors ready

jieyouxu
jieyouxu requested changes May 31, 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 problem

tests/run-make/cdylib/rmake.rs Outdated
// - `foo()` which calls `bar::bar()`.
// - `bar()` which implements basic addition.

// @ignore-cross-compile
Copy link
Member

Choose a reason for hiding this comment

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

Problem: this needs to be

Suggested change
// @ignore-cross-compile
//@ ignore-cross-compile

Copy link
Member

Choose a reason for hiding this comment

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

cc #125813

@jieyouxu
Copy link
Member

r=me after fixing the directive :3

@GuillaumeGomez
Copy link
Member Author

@bors r=jieyouxu rollup

@bors
Copy link
Contributor

bors commented May 31, 2024

📌 Commit c0646f7 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#125773 - GuillaumeGomez:migrate-run-make-cd…
e3042f7 
…ylib, r=jieyouxu

Migrate run make cdylib

Part of rust-lang#121876.

r? `@jieyouxu`
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
jhpratt added a commit to jhpratt/rust that referenced this pull request Jun 1, 2024
@jhpratt
Rollup merge of rust-lang#125773 - GuillaumeGomez:migrate-run-make-cd…
babb8db 
…ylib, r=jieyouxu

Migrate run make cdylib

Part of rust-lang#121876.

r? `@jieyouxu`
@jhpratt jhpratt mentioned this pull request Jun 1, 2024
Closed
jhpratt added a commit to jhpratt/rust that referenced this pull request Jun 1, 2024
@jhpratt
Rollup merge of rust-lang#125773 - GuillaumeGomez:migrate-run-make-cd…
35622d7 
…ylib, r=jieyouxu

Migrate run make cdylib

Part of rust-lang#121876.

r? ``@jieyouxu``
@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 1, 2024
@GuillaumeGomez
Copy link
Member Author

Fixed formatting.

@jhpratt
Copy link
Member

jhpratt commented Jun 1, 2024

@bors r=jieyouxu

@bors
Copy link
Contributor

bors commented Jun 1, 2024

📌 Commit 8742bf3 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#125773 - GuillaumeGomez:migrate-run-make-cd…
5cce92e 
…ylib, r=jieyouxu

Migrate run make cdylib

Part of rust-lang#121876.

r? `@jieyouxu`
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
fmease added a commit to fmease/rust that referenced this pull request Jun 1, 2024
@fmease
Rollup merge of rust-lang#125773 - GuillaumeGomez:migrate-run-make-cd…
2294577 
…ylib, r=jieyouxu

Migrate run make cdylib

Part of rust-lang#121876.

r? ``@jieyouxu``
fmease added a commit to fmease/rust that referenced this pull request Jun 1, 2024
@fmease
Rollup merge of rust-lang#125808 - GuillaumeGomez:migrate-run-make-c-…
9e62260 
…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``
@fmease fmease 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#125872 - fmease:rollup-ei6igof, r=fmease
17a3152 
Rollup of 4 pull requests

Successful merges:

 - rust-lang#124294 (Unroll first iteration of checked_ilog loop)
 - rust-lang#125773 (Migrate run make cdylib)
 - rust-lang#125808 (Migrate `run-make/c-link-to-rust-dylib` to `rmake.rs`)
 - rust-lang#125822 (Refactor `--print=check-cfg` test)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Jun 2, 2024

⌛ Testing commit 8742bf3 with merge 06d99cd...

@bors
Copy link
Contributor

bors commented Jun 2, 2024

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing 06d99cd to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 2, 2024
@bors bors merged commit 06d99cd into rust-lang:master Jun 2, 2024
7 checks passed
@rustbot rustbot added this to the 1.80.0 milestone Jun 2, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2024
@bors
Auto merge of rust-lang#125808 - GuillaumeGomez:migrate-run-make-c-li…
9fc7ab9 
…nk-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`
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (06d99cd): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 0.4% [0.4%, 0.4%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.4% [0.4%, 0.4%] 1

Max RSS (memory usage)

Results (primary -2.9%, secondary 2.7%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 2.7% [2.7%, 2.7%] 1
Improvements ✅
(primary)		 -2.9% [-2.9%, -2.9%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -2.9% [-2.9%, -2.9%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 669.701s -> 667.911s (-0.27%)
Artifact size: 318.89 MiB -> 318.88 MiB (-0.00%)

@GuillaumeGomez GuillaumeGomez deleted the migrate-run-make-cdylib branch June 2, 2024 08:20
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`
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 2, 2024
@workingjubilee
Rollup merge of rust-lang#125808 - GuillaumeGomez:migrate-run-make-c-…
800b2f8 
…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`
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`
@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 merged-by-bors This PR was explicitly merged by bors. 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.
7 participants
@GuillaumeGomez @rustbot @rust-log-analyzer @jieyouxu @bors @jhpratt @rust-timer