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

Explicitly unset $CARGO for compiletest #118059

Merged
merged 1 commit into from
Nov 21, 2023
Merged

Conversation

Noratrieb
Copy link
Member

Some UI tests trigger behavior in rustc where it reads $CARGO and changes behavior if it exists. To make the tests work that rely on it not being set, make sure it is not set.

By default, this is not set, but people may do weird hacks that cause it to be set.

closes #118058

Some UI tests trigger behavior in rustc where it reads $CARGO and changes behavior if it exists.
To make the tests work that rely on it not being set, make sure it is not set.

By default, this is not set, but people may do weird hacks
that cause it to be set.
@rustbot
Copy link
Collaborator

rustbot commented Nov 19, 2023

r? @clubby789

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

@rustbot rustbot added 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 Nov 19, 2023
Copy link
Member

@dtolnay dtolnay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@dtolnay
Copy link
Member

dtolnay commented Nov 19, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Nov 19, 2023

📌 Commit 251e75c has been approved by dtolnay

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 Nov 19, 2023
@dtolnay dtolnay assigned dtolnay and unassigned clubby789 Nov 19, 2023
@WaffleLapkin
Copy link
Member

@bors rollup

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 21, 2023
Rollup of 7 pull requests

Successful merges:

 - rust-lang#117790 (CFI: Add missing use core::ffi::c_int)
 - rust-lang#118059 (Explicitly unset $CARGO for compiletest)
 - rust-lang#118081 (`rustc_ty_utils` cleanups)
 - rust-lang#118094 (feat: specialize `SpecFromElem` for `()`)
 - rust-lang#118097 (Update books)
 - rust-lang#118115 (Fix occurrences of old fn names in comment and tracing)
 - rust-lang#118121 (`rustc_hir` cleanups)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 187d44b into rust-lang:master Nov 21, 2023
11 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Nov 21, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 21, 2023
Rollup merge of rust-lang#118059 - Nilstrieb:unset-cargo, r=dtolnay

Explicitly unset $CARGO for compiletest

Some UI tests trigger behavior in rustc where it reads $CARGO and changes behavior if it exists. To make the tests work that rely on it not being set, make sure it is not set.

By default, this is not set, but people may do weird hacks that cause it to be set.

closes rust-lang#118058
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

edition suggestion UI tests fail when CARGO is set
6 participants