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

Replace rustdoc-ui/{c,z}-help tests with a stable run-make test #109810

Merged
merged 2 commits into from
Apr 13, 2023

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Mar 31, 2023

This make rustdoc resilient to changes in the debugging options while still testing that it matches rustc.

Fixes #109391.

@rustbot
Copy link
Collaborator

rustbot commented Mar 31, 2023

r? @TaKO8Ki

(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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Mar 31, 2023
@@ -398,6 +398,8 @@ fn run_test(
compiler.stdin(Stdio::piped());
compiler.stderr(Stdio::piped());

debug!("compiler invocation for doctest: {:?}", compiler);
Copy link
Member Author

Choose a reason for hiding this comment

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

I added this so I could double check that -C ... flags are passed through to the compiler when running doctests.

@jyn514 jyn514 force-pushed the rustdoc-opt-tests branch from 234f3c5 to 72ea377 Compare March 31, 2023 11:10
@bors
Copy link
Contributor

bors commented Apr 4, 2023

☔ The latest upstream changes (presumably #109808) made this pull request unmergeable. Please resolve the merge conflicts.

@jyn514 jyn514 force-pushed the rustdoc-opt-tests branch from 72ea377 to 876615e Compare April 5, 2023 00:43
@jyn514
Copy link
Member Author

jyn514 commented Apr 5, 2023

This PR bitrots quickly; I'm not planning to rebase it until I get an initial review.

Copy link
Member

@TaKO8Ki TaKO8Ki left a comment

Choose a reason for hiding this comment

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

Sorry for the late review. I thinks this looks good to me. Could you fix conflicts?

Before, rustdoc was missing `-C passes=list` and the "Available options"
header.

Making these match allows testing that they match exactly.
@jyn514 jyn514 force-pushed the rustdoc-opt-tests branch from 876615e to a25749e Compare April 12, 2023 10:28
@jyn514
Copy link
Member Author

jyn514 commented Apr 12, 2023

Sure thing, done :)

@bors r=TaKO8Ki

@bors
Copy link
Contributor

bors commented Apr 12, 2023

📌 Commit a25749e17e2ccb3a8c21df580303a4ca85ae20b6 has been approved by TaKO8Ki

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 12, 2023
This make rustdoc resilient to changes in the debugging options while
still testing that it matches rustc.
@jyn514 jyn514 force-pushed the rustdoc-opt-tests branch from a25749e to 67b3919 Compare April 12, 2023 10:34
@jyn514
Copy link
Member Author

jyn514 commented Apr 12, 2023

@bors r- r=TaKO8Ki

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 12, 2023
@bors
Copy link
Contributor

bors commented Apr 12, 2023

📌 Commit 67b3919 has been approved by TaKO8Ki

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 12, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#109810 (Replace rustdoc-ui/{c,z}-help tests with a stable run-make test )
 - rust-lang#110035 (fix: ensure bad `#[test]` invocs retain correct AST)
 - rust-lang#110089 (sync::mpsc: synchronize receiver disconnect with initialization)
 - rust-lang#110103 (Report overflows gracefully with new solver)
 - rust-lang#110122 (Fix x check --stage 1 when download-ci-llvm=false)
 - rust-lang#110133 (Do not use ImplDerivedObligationCause for inherent impl method error reporting)
 - rust-lang#110135 (Revert "Don't recover lifetimes/labels containing emojis as character literals")
 - rust-lang#110235 (Fix `--extend-css` option)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 559b2ea into rust-lang:master Apr 13, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 13, 2023
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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

-Z help and/or the z-help.stdout test is fragile
4 participants