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

Clean up source root in run-make tests #126112

Merged
merged 2 commits into from
Jun 7, 2024

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Jun 7, 2024

The name S isn't exactly the most descriptive, and we also shouldn't need to pass it when building (actually I think that most of the env. vars that we pass to cargo here are probably not really needed).

Related issue: #126071

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

rustbot commented Jun 7, 2024

The run-make-support library was changed

cc @jieyouxu

Some changes occurred in src/tools/compiletest

cc @jieyouxu

Some changes occurred in run-make tests.

cc @jieyouxu

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 for the cleanup, r=me after CI is green

@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 7, 2024

@bors r=jieyouxu rollup

@bors
Copy link
Contributor

bors commented Jun 7, 2024

📌 Commit eac63b7 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 Jun 7, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 7, 2024
…ouxu

Clean up source root in run-make tests

The name `S` isn't exactly the most descriptive, and we also shouldn't need to pass it when building (actually I think that most of the env. vars that we pass to `cargo` here are probably not really needed).

Related issue: rust-lang#126071

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

Rollup of 11 pull requests

Successful merges:

 - rust-lang#116088 (Stabilise `c_unwind`)
 - rust-lang#124012 (Stabilize `binary_heap_as_slice`)
 - rust-lang#124214 (Parse unsafe attributes)
 - rust-lang#125572 (Detect pub structs never constructed and unused associated constants)
 - rust-lang#125781 (prefer `compile::stream_cargo` for building tools)
 - rust-lang#126030 (Update `./x fmt` command in library/std/src/sys/pal/windows/c/README.md)
 - rust-lang#126047 (Simplify the rayon calls in the installer)
 - rust-lang#126070 (Enable f16 in assembly on aarch64 platforms that support it)
 - rust-lang#126089 (Stabilize Option::take_if)
 - rust-lang#126112 (Clean up source root in run-make tests)
 - rust-lang#126119 (Improve docs for using custom paths with `--emit`)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 7, 2024
…ouxu

Clean up source root in run-make tests

The name `S` isn't exactly the most descriptive, and we also shouldn't need to pass it when building (actually I think that most of the env. vars that we pass to `cargo` here are probably not really needed).

Related issue: rust-lang#126071

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

Rollup of 10 pull requests

Successful merges:

 - rust-lang#116088 (Stabilise `c_unwind`)
 - rust-lang#124012 (Stabilize `binary_heap_as_slice`)
 - rust-lang#124214 (Parse unsafe attributes)
 - rust-lang#125572 (Detect pub structs never constructed and unused associated constants)
 - rust-lang#125781 (prefer `compile::stream_cargo` for building tools)
 - rust-lang#126030 (Update `./x fmt` command in library/std/src/sys/pal/windows/c/README.md)
 - rust-lang#126047 (Simplify the rayon calls in the installer)
 - rust-lang#126089 (Stabilize Option::take_if)
 - rust-lang#126112 (Clean up source root in run-make tests)
 - rust-lang#126119 (Improve docs for using custom paths with `--emit`)

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

Rollup of 11 pull requests

Successful merges:

 - rust-lang#124012 (Stabilize `binary_heap_as_slice`)
 - rust-lang#124214 (Parse unsafe attributes)
 - rust-lang#125572 (Detect pub structs never constructed and unused associated constants)
 - rust-lang#125781 (prefer `compile::stream_cargo` for building tools)
 - rust-lang#126030 (Update `./x fmt` command in library/std/src/sys/pal/windows/c/README.md)
 - rust-lang#126047 (Simplify the rayon calls in the installer)
 - rust-lang#126052 (More `rustc_parse` cleanups)
 - rust-lang#126077 (Revert "Use the HIR instead of mir_keys for determining whether something will have a MIR body.")
 - rust-lang#126089 (Stabilize Option::take_if)
 - rust-lang#126112 (Clean up source root in run-make tests)
 - rust-lang#126119 (Improve docs for using custom paths with `--emit`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b8e28d1 into rust-lang:master Jun 7, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone Jun 7, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
Rollup merge of rust-lang#126112 - Kobzol:runmake-source-root, r=jieyouxu

Clean up source root in run-make tests

The name `S` isn't exactly the most descriptive, and we also shouldn't need to pass it when building (actually I think that most of the env. vars that we pass to `cargo` here are probably not really needed).

Related issue: rust-lang#126071

r? ```@jieyouxu```
@Kobzol Kobzol deleted the runmake-source-root branch June 8, 2024 05:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants