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/invalid-library to rmake.rs #126861

Merged
merged 3 commits into from
Jun 27, 2024
Merged

Migrate run-make/invalid-library to rmake.rs #126861

merged 3 commits into from
Jun 27, 2024

Conversation

GuillaumeGomez
Copy link
Member

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

Part of #121876.

r? @jieyouxu

try-job: x86_64-msvc

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

rustbot commented Jun 23, 2024

The run-make-support library was changed

cc @jieyouxu

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

@GuillaumeGomez GuillaumeGomez changed the title Migrate run make invalid library Migrate run-make/invalid-library to rmake.rs Jun 23, 2024
@Kobzol Kobzol mentioned this pull request Jun 23, 2024
Open
@Kobzol
Copy link
Contributor

Kobzol commented Jun 23, 2024

r? @Kobzol

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Jun 23, 2024

📌 Commit 10990e2 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 Jun 23, 2024
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 24, 2024
@workingjubilee
Rollup merge of rust-lang#126861 - GuillaumeGomez:migrate-run-make-in…
969bbc6 
…valid-library, r=Kobzol

Migrate `run-make/invalid-library` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`
@workingjubilee workingjubilee mentioned this pull request Jun 24, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 24, 2024
@bors
Auto merge of rust-lang#126886 - workingjubilee:rollup-e6ar0vq, r=wor…
bb6d372 
…kingjubilee

Rollup of 9 pull requests

Successful merges:

 - rust-lang#126177 (Add hard error and migration lint for unsafe attrs)
 - rust-lang#126298 (Promote loongarch64-unknown-linux-musl to Tier 2 with host tools)
 - rust-lang#126455 (For [E0308]: mismatched types, when expr is in an arm's body, not add semicolon ';' at the end of it.)
 - rust-lang#126754 (Implement `use<>` formatting in rustfmt)
 - rust-lang#126807 (std::unix::fs: copy simplification for apple.)
 - rust-lang#126845 (Weekly `cargo update`)
 - rust-lang#126849 (Fix 32-bit Arm reg classes by hierarchically sorting them)
 - rust-lang#126854 (std::unix::os::home_dir: fallback's optimisation.)
 - rust-lang#126861 (Migrate `run-make/invalid-library` to `rmake.rs`)

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

@bors r-
#126886 (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 24, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Jun 24, 2024 •
edited
Loading

Oh yeah this is another case of I can't seem to figure out if/when AR is available on Windows platforms (//@ needs-ar?)

@rustbot
Copy link
Collaborator

rustbot commented Jun 24, 2024

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-invalid-library branch from f62afdc to 22cac46 Compare June 24, 2024 09:07
@GuillaumeGomez
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Jun 24, 2024

⌛ Trying commit 22cac46 with merge 4f44f04...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 24, 2024
@bors
Auto merge of rust-lang#126861 - GuillaumeGomez:migrate-run-make-inva…
4f44f04 
…lid-library, r=<try>

Migrate `run-make/invalid-library` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: x86_64-msvc
@Kobzol
Copy link
Contributor

Kobzol commented Jun 24, 2024

Maybe a more general solution is to just use e.g. https://docs.rs/ar/latest/ar/ instead of an external binary?

@GuillaumeGomez
Copy link
Member Author

Do you want it to be part of this PR (and as part of run_make_support) or as a follow-up?

@Kobzol
Copy link
Contributor

Kobzol commented Jun 24, 2024

Doesn't need to be a part of this PR, although if it does indeed work reliably (even on Windows), then maybe we might remove needs-ar in the future.

@GuillaumeGomez
Copy link
Member Author

Doing it in this PR then.

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-invalid-library branch from 22cac46 to 8a644ff Compare June 24, 2024 09:47
@rustbot
Copy link
Collaborator

rustbot commented Jun 24, 2024

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@GuillaumeGomez
Copy link
Member Author

It now uses the ar crate.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jun 26, 2024

☔ The latest upstream changes (presumably #126979) made this pull request unmergeable. Please resolve the merge conflicts.

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-invalid-library branch from 8a644ff to 3394fe8 Compare June 27, 2024 12:05
@GuillaumeGomez
Copy link
Member Author

Fixed merge conflicts.

@Kobzol
Copy link
Contributor

Kobzol commented Jun 27, 2024

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 27, 2024
@bors
Auto merge of rust-lang#126861 - GuillaumeGomez:migrate-run-make-inva…
529edc7 
…lid-library, r=<try>

Migrate `run-make/invalid-library` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: x86_64-msvc
@bors
Copy link
Contributor

bors commented Jun 27, 2024

⌛ Trying commit 3394fe8 with merge 529edc7...

@bors
Copy link
Contributor

bors commented Jun 27, 2024

☀️ Try build successful - checks-actions
Build commit: 529edc7 (529edc73f0339424ce56ae32649b7e162f005258)

@Kobzol
Copy link
Contributor

Kobzol commented Jun 27, 2024

The previously failed job now works, let's try again.

@bors r+

@bors
Copy link
Contributor

bors commented Jun 27, 2024

📌 Commit 3394fe8 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 Jun 27, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Jun 27, 2024

@bors rollup=iffy

@bors
Copy link
Contributor

bors commented Jun 27, 2024

⌛ Testing commit 3394fe8 with merge 2495953...

@bors
Copy link
Contributor

bors commented Jun 27, 2024

☀️ Test successful - checks-actions
Approved by: Kobzol
Pushing 2495953 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 27, 2024
@bors bors merged commit 2495953 into rust-lang:master Jun 27, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 27, 2024
@GuillaumeGomez GuillaumeGomez deleted the migrate-run-make-invalid-library branch June 27, 2024 17:40
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (2495953): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary -6.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)		 - - 0
Improvements ✅
(primary)		 -6.7% [-6.7%, -6.7%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -6.7% [-6.7%, -6.7%] 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: 697.296s -> 695.757s (-0.22%)
Artifact size: 326.82 MiB -> 326.76 MiB (-0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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 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.81.0
Development

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