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

Clear RUSTDOCFLAGS before running tests #8168

Merged
merged 1 commit into from
Apr 27, 2020

Conversation

ecstatic-morse
Copy link
Contributor

It turns out that this test will fail if RUSTDOCFLAGS is set in the test runner. This was found in
rust-lang/rust#71458 (comment) when that PR attempted to set the proper RUSTDOCFLAGS to enable ./x.py doc --stage 0 src/libstd. Run the test with no RUSTDOCFLAGS so that the config file always gets used.

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ehuss (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 27, 2020
@alexcrichton
Copy link
Member

Thanks!

I think though a better place for this might perhaps be in this function? That way we'd catch it for all future tests too

@ecstatic-morse ecstatic-morse changed the title Future proof test from changes to RUSTDOCFLAGS Clear RUSTDOCFLAGS before running tests Apr 27, 2020
@ecstatic-morse
Copy link
Contributor Author

I think though a better place for this might perhaps be in this function? That way we'd catch it for all future tests too

Indeed! That's much better.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Apr 27, 2020

📌 Commit cf57ce1 has been approved by alexcrichton

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

bors commented Apr 27, 2020

⌛ Testing commit cf57ce1 with merge a0a14f2...

@bors
Copy link
Contributor

bors commented Apr 27, 2020

☀️ Test successful - checks-azure
Approved by: alexcrichton
Pushing a0a14f2 to master...

@bors bors merged commit a0a14f2 into rust-lang:master Apr 27, 2020
@ecstatic-morse ecstatic-morse deleted the future-proof-test branch April 27, 2020 23:15
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 28, 2020
Update cargo

11 commits in 8751eb3010d4cdb5329b5a6bd2b6d765c95b0dca..90931d9b31e8b854522fed00916504a3ac6d8619
2020-04-21 18:04:35 +0000 to 2020-04-28 01:56:59 +0000
- Use associated constants directly on primitive types instead of modules (rust-lang/cargo#8077)
- Clear `RUSTDOCFLAGS` before running tests (rust-lang/cargo#8168)
- Fix warning for `resolve` mismatch in workspace. (rust-lang/cargo#8169)
- Fix flaky linking_interrupted test. (rust-lang/cargo#8162)
- Fixed some unnecessary borrows and clones. (rust-lang/cargo#8146)
- Added warning when using restricted names in Windows. (rust-lang/cargo#8136)
- Add changelog about dylib uplift. (rust-lang/cargo#8161)
- Mention that cargo_metadata can parse json messages (rust-lang/cargo#8158)
- Re-enable rustc-info-cache test again (rust-lang/cargo#8155)
- Updates to path source walking. (rust-lang/cargo#8095)
- Bump to 0.46.0, update changelog (rust-lang/cargo#8153)
@ehuss ehuss added this to the 1.45.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.

5 participants