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

Allow overwriting the sysroot compile flag in compile tests #110584

Merged
merged 1 commit into from
Apr 20, 2023

Conversation

Veykril
Copy link
Member

@Veykril Veykril commented Apr 20, 2023

This was added in https://github.com/rust-lang/rust/pull/110478/files#diff-03a0567fa80ca04ed5a55f9ac5c711b4f84659be2d0ac4a984196d581c04f76b, unconditionally passing the sysroot flag to the compile test invocations. In our ferrocene fork we have a few tests that test the sysroot flag specifically which fail due to the flag being passed multiple times now.

We believe upstreaming this small change could be beneficial should rust-lang/rust also want to test certain sysroot setups in the future.

@rustbot
Copy link
Collaborator

rustbot commented Apr 20, 2023

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

@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 Apr 20, 2023
@Veykril Veykril force-pushed the comptest-sysroot-arg branch from e71fb10 to e434b5b Compare April 20, 2023 08:08
@oli-obk
Copy link
Contributor

oli-obk commented Apr 20, 2023

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 20, 2023

📌 Commit e434b5b has been approved by oli-obk

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 Apr 20, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 20, 2023
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#110240 (Add `indent_style = tab` for `Makefile`s to `.editorconfig`)
 - rust-lang#110545 (Add `GenericArgKind::as_{type,const,region}`)
 - rust-lang#110574 ( fix out-of-date comment about rpath in bootstrap)
 - rust-lang#110581 (Style fix for loongarch-linux.md)
 - rust-lang#110584 (Allow overwriting the sysroot compile flag in compile tests)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 56d08d1 into rust-lang:master Apr 20, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 20, 2023
@Veykril Veykril deleted the comptest-sysroot-arg branch April 20, 2023 15:21
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
None yet
Development

Successfully merging this pull request may close these issues.

4 participants