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.

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

Add a run-make test that LLD is not being used by default on the x64 beta/stable channel #127081

Merged
merged 1 commit into from
Jun 30, 2024

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Jun 28, 2024

#126701 showed that the handling of lld in bootstrap is currently not ideal. While it would be nice to refactor it eventually, we should also make sure that we have a test that checks that lld is not used (yet!) by default on the x64 Linux stable channel.

CC @lqd

r? @onur-ozkan

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 28, 2024
@bors
Copy link
Contributor

bors commented Jun 28, 2024

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

@Kobzol Kobzol marked this pull request as ready for review June 29, 2024 06:41
@rustbot
Copy link
Collaborator

rustbot commented Jun 29, 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

@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 29, 2024

Rebased.

@rustbot ready

@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 29, 2024

Switched the test to ignore-nightly.

@onur-ozkan
Copy link
Member

Since it's no longer stable channel specific, should we update the test name?

@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 29, 2024

beta-stable?

@onur-ozkan
Copy link
Member

beta-stable?

Yeah, this sounds good.

@Kobzol Kobzol changed the title Add a run-make test that LLD is not being used by default on the x64 stable channel Add a run-make test that LLD is not being used by default on the x64 beta/stable channel Jun 29, 2024
@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 29, 2024

Ok, done.

@onur-ozkan
Copy link
Member

Awesome!

@bors r+

@bors
Copy link
Contributor

bors commented Jun 29, 2024

📌 Commit ac385e3 has been approved by onur-ozkan

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 29, 2024
@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 29, 2024

I fixed the comment based on lqd's suggestion. I'll wait for #127081 (comment) until reapproving.

@bors 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 29, 2024
@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 29, 2024

@bors r=onur-ozkan

@bors
Copy link
Contributor

bors commented Jun 29, 2024

📌 Commit 4442fd7 has been approved by onur-ozkan

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 29, 2024
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 29, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 29, 2024
Add a run-make test that LLD is not being used by default on the x64 beta/stable channel

rust-lang#126701 showed that the handling of `lld` in bootstrap is currently not ideal. While it would be nice to refactor it eventually, we should also make sure that we have a test that checks that `lld` is not used (yet!) by default on the x64 Linux stable channel.

CC `@lqd`

r? `@onur-ozkan`
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 29, 2024
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#123237 (Various rustc_codegen_ssa cleanups)
 - rust-lang#126960 (Improve error message in tidy)
 - rust-lang#127002 (Implement `x perf` as a separate tool)
 - rust-lang#127050 (Make mtime of reproducible tarballs dependent on git commit)
 - rust-lang#127081 (Add a run-make test that LLD is not being used by default on the x64 beta/stable channel)
 - rust-lang#127106 (Improve unsafe extern blocks diagnostics)
 - rust-lang#127110 (Fix a error suggestion for E0121 when using placeholder _ as return types on function signature.)
 - rust-lang#127114 (fix: prefer `(*p).clone` to `p.clone` if the `p` is a raw pointer)
 - rust-lang#127118 (Show `used attribute`'s kind for user when find it isn't applied to a `static` variable.)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 29, 2024
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#123237 (Various rustc_codegen_ssa cleanups)
 - rust-lang#126960 (Improve error message in tidy)
 - rust-lang#127002 (Implement `x perf` as a separate tool)
 - rust-lang#127081 (Add a run-make test that LLD is not being used by default on the x64 beta/stable channel)
 - rust-lang#127106 (Improve unsafe extern blocks diagnostics)
 - rust-lang#127110 (Fix a error suggestion for E0121 when using placeholder _ as return types on function signature.)
 - rust-lang#127114 (fix: prefer `(*p).clone` to `p.clone` if the `p` is a raw pointer)
 - rust-lang#127118 (Show `used attribute`'s kind for user when find it isn't applied to a `static` variable.)
 - rust-lang#127122 (Remove uneccessary condition in `div_ceil`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 30, 2024
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#123237 (Various rustc_codegen_ssa cleanups)
 - rust-lang#126960 (Improve error message in tidy)
 - rust-lang#127002 (Implement `x perf` as a separate tool)
 - rust-lang#127081 (Add a run-make test that LLD is not being used by default on the x64 beta/stable channel)
 - rust-lang#127106 (Improve unsafe extern blocks diagnostics)
 - rust-lang#127110 (Fix a error suggestion for E0121 when using placeholder _ as return types on function signature.)
 - rust-lang#127114 (fix: prefer `(*p).clone` to `p.clone` if the `p` is a raw pointer)
 - rust-lang#127118 (Show `used attribute`'s kind for user when find it isn't applied to a `static` variable.)
 - rust-lang#127122 (Remove uneccessary condition in `div_ceil`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fafb2ea into rust-lang:master Jun 30, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 30, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 30, 2024
Rollup merge of rust-lang#127081 - Kobzol:lld-test, r=onur-ozkan

Add a run-make test that LLD is not being used by default on the x64 beta/stable channel

rust-lang#126701 showed that the handling of `lld` in bootstrap is currently not ideal. While it would be nice to refactor it eventually, we should also make sure that we have a test that checks that `lld` is not used (yet!) by default on the x64 Linux stable channel.

CC ``@lqd``

r? ``@onur-ozkan``
@Kobzol Kobzol deleted the lld-test branch June 30, 2024 05:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

6 participants