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 atomic-lock-free to rmake #127787

Merged
merged 2 commits into from
Jul 18, 2024
Merged

Migrate atomic-lock-free to rmake #127787

merged 2 commits into from
Jul 18, 2024

Conversation

Rejyr
Copy link
Contributor

@Rejyr Rejyr commented Jul 15, 2024 •
edited
Loading

Also adds llvm_components_contain to run-make-support.

Part of #121876.

r? @jieyouxu

try-job: dist-x86_64-linux

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

rustbot commented Jul 15, 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

The run-make-support library was changed

cc @jieyouxu

@jieyouxu jieyouxu mentioned this pull request Jul 16, 2024
Open
jieyouxu
jieyouxu reviewed Jul 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! Just one suggestion for //@ only-linux. I'll also run some try jobs to check.

tests/run-make/atomic-lock-free/rmake.rs Outdated Show resolved Hide resolved
src/tools/run-make-support/src/lib.rs Outdated Show resolved Hide resolved
@jieyouxu
Copy link
Member

@bors try

@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 Jul 16, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 16, 2024
@bors
Auto merge of rust-lang#127787 - Rejyr:migrate-atomic-lock-free-rmake…
db1a6e7 
…, r=<try>

Migrate `atomic-lock-free` to `rmake`

Also adds `is_linux` and `llvm_components_contain` to `run-make-support`.

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: dist-x86_64-linux
@bors
Copy link
Contributor

bors commented Jul 16, 2024

⌛ Trying commit 7519704 with merge db1a6e7...

@bors
Copy link
Contributor

bors commented Jul 16, 2024

☀️ Try build successful - checks-actions
Build commit: db1a6e7 (db1a6e7505d7342137fcdff154ab409eb306b7fe)

@Rejyr Rejyr force-pushed the migrate-atomic-lock-free-rmake branch from 7519704 to 4b58924 Compare July 16, 2024 10:48
@jieyouxu
Copy link
Member

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 16, 2024
@bors
Copy link
Contributor

bors commented Jul 17, 2024

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

@Rejyr Rejyr force-pushed the migrate-atomic-lock-free-rmake branch from 4b58924 to a8b6e3f Compare July 17, 2024 20:48
@jieyouxu
Copy link
Member

Thanks!
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 18, 2024

📌 Commit a8b6e3f 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 Jul 18, 2024
tgross35 added a commit to tgross35/rust that referenced this pull request Jul 18, 2024
@tgross35
Rollup merge of rust-lang#127787 - Rejyr:migrate-atomic-lock-free-rma…
af30f40 
…ke, r=jieyouxu

Migrate `atomic-lock-free` to `rmake`

Also adds `llvm_components_contain` to `run-make-support`.

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: dist-x86_64-linux
@tgross35 tgross35 mentioned this pull request Jul 18, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 18, 2024
@bors
Auto merge of rust-lang#127896 - tgross35:rollup-lpv5op8, r=tgross35
a1ebad5 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#127077 (Make language around `ToOwned` for `BorrowedFd` more precise)
 - rust-lang#127523 (Migrate `dump-ice-to-disk` and `panic-abort-eh_frame` `run-make` tests to rmake)
 - rust-lang#127787 (Migrate `atomic-lock-free` to `rmake`)
 - rust-lang#127806 (Some parser improvements)
 - rust-lang#127810 (Rename `tcx` to `cx` in `rustc_type_ir`)
 - rust-lang#127878 (Fix associated item removal suggestion)
 - rust-lang#127886 (Accurate `use` rename suggestion span)
 - rust-lang#127888 (More accurate span for type parameter suggestion)
 - rust-lang#127889 (More accurate span for anonymous argument suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 18, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 18, 2024
@bors
Auto merge of rust-lang#127898 - matthiaskrgr:rollup-lkkpoui, r=matth…
52f3c71 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#127077 (Make language around `ToOwned` for `BorrowedFd` more precise)
 - rust-lang#127783 (Put the dots back in RTN pretty printing)
 - rust-lang#127787 (Migrate `atomic-lock-free` to `rmake`)
 - rust-lang#127810 (Rename `tcx` to `cx` in `rustc_type_ir`)
 - rust-lang#127878 (Fix associated item removal suggestion)
 - rust-lang#127886 (Accurate `use` rename suggestion span)
 - rust-lang#127888 (More accurate span for type parameter suggestion)
 - rust-lang#127889 (More accurate span for anonymous argument suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2013bf9 into rust-lang:master Jul 18, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 18, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 18, 2024
@rust-timer
Unrolled build for rust-lang#127787
238f4d7 
Rollup merge of rust-lang#127787 - Rejyr:migrate-atomic-lock-free-rmake, r=jieyouxu

Migrate `atomic-lock-free` to `rmake`

Also adds `llvm_components_contain` to `run-make-support`.

Part of rust-lang#121876.

r? ``@jieyouxu``

try-job: dist-x86_64-linux
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fbstj fbstj fbstj left review comments

@jieyouxu jieyouxu jieyouxu left review comments

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.
5 participants
@Rejyr @rustbot @jieyouxu @bors @fbstj