Skip to content

Fix test escaping __CARGO_TEST_ROOT#8929

Merged
bors merged 1 commit intorust-lang:masterfrom
ehuss:fix-git-config-author
Dec 2, 2020
Merged

Fix test escaping __CARGO_TEST_ROOT#8929
bors merged 1 commit intorust-lang:masterfrom
ehuss:fix-git-config-author

Conversation

@ehuss
Copy link
Contributor

@ehuss ehuss commented Dec 2, 2020

#8886 added a test which unsets __CARGO_TEST_ROOT, but that environment variable is there for a reason. This causes problems as it causes that test to load the .cargo/config from the real home directory, which if it contains a [cargo-new] section, causes the test to fail.

The fix here is to change find_tests_git_config so that it behaves more like the real git config loader, but avoids escaping the test sandbox. There are some subtle issues here, like #7469, which I believe should still work correctly.

@rust-highfive
Copy link

r? @Eh2406

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 2, 2020
@Eh2406
Copy link
Contributor

Eh2406 commented Dec 2, 2020

Seems reasonable r+ when you are ready.

@ehuss
Copy link
Contributor Author

ehuss commented Dec 2, 2020

@bors r=Eh2406

@bors
Copy link
Contributor

bors commented Dec 2, 2020

📌 Commit c3e01b8 has been approved by Eh2406

@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 Dec 2, 2020
@bors
Copy link
Contributor

bors commented Dec 2, 2020

⌛ Testing commit c3e01b8 with merge c7939ae...

@bors
Copy link
Contributor

bors commented Dec 2, 2020

☀️ Test successful - checks-actions
Approved by: Eh2406
Pushing c7939ae to master...

@bors bors merged commit c7939ae into rust-lang:master Dec 2, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 8, 2020
Update cargo

10 commits in 63d0fe43449adcb316d34d98a982b597faca4178..d274fcf862b89264fa2c6b917b15230705257317
2020-12-02 01:44:30 +0000 to 2020-12-07 23:08:44 +0000
- Clarify cargo manifest edition field docs (rust-lang/cargo#8953)
- Run rustdoc doctests relative to the workspace (rust-lang/cargo#8954)
- Workaround fs issue in `cargo publish`. (rust-lang/cargo#8950)
- Fix panic with -Zbuild-std and no roots. (rust-lang/cargo#8942)
- Slightly optimize `cargo vendor` (rust-lang/cargo#8937)
- Fixes rust-lang/cargo#8783 , cargo new fails without a author name or email (rust-lang/cargo#8912)
- Fix test escaping __CARGO_TEST_ROOT (rust-lang/cargo#8929)
- Add period to allowed feature name characters. (rust-lang/cargo#8932)
- faq: small fixes (rust-lang/cargo#8931)
- Fix semver documentation tests. (rust-lang/cargo#8930)
@ehuss ehuss added this to the 1.50.0 milestone Feb 6, 2022
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants