Skip to content

Don't show HTML diff if tidy isn't installed for rustdoc tests - #83228

Merged
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:no-diff-if-no-tidy
Mar 18, 2021
Merged

Don't show HTML diff if tidy isn't installed for rustdoc tests#83228
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:no-diff-if-no-tidy

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Mar 17, 2021

Copy link
Copy Markdown
Member

The output without the tidy tool is just way too big to be of any use. It makes reading the error much more complicated.

r? @jyn514

@GuillaumeGomezGuillaumeGomez added the A-testsuite Area: The testsuite used to check the correctness of rustc label Mar 17, 2021
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 17, 2021
@jyn514jyn514 added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Mar 17, 2021
@jyn514

jyn514 commented Mar 17, 2021

Copy link
Copy Markdown
Member

Can you also change https://github.com/rust-lang/rust/blob/3e262ae01b01ad5f143a61235b51424bf039813c/src/tools/compiletest/src/main.rs#L47 to say "diffs will not be generated" instead of "diffs will be harder to read"? And post a snippet of the output?

@GuillaumeGomez

GuillaumeGomez commented Mar 17, 2021

Copy link
Copy Markdown
MemberAuthor

Ah sure. Need to uninstall tidy too.

@GuillaumeGomez

GuillaumeGomez commented Mar 17, 2021

Copy link
Copy Markdown
MemberAuthor

Here it is:

Check compiletest suite=rustdoc mode=rustdoc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
warning: `tidy` is not installed; diffs will not be generated
running 427 tests
................F................................................................................... 100/427
.................................................................................................... 200/427
.................................................................................................... 300/427
...................................................i................................................ 400/427
...........................
failures:
---- [rustdoc] rustdoc/check-styled-link.rs stdout ----
error: htmldocck failed!
status: exit code: 1
command: "/usr/bin/python" "/home/imperio/rust/rust/src/etc/htmldocck.py" "/home/imperio/rust/rust/build/x86_64-unknown-linux-gnu/test/rustdoc/check-styled-link" "/home/imperio/rust/rust/src/test/rustdoc/check-styled-link.rs"
stdout:
------------------------------------------
------------------------------------------
stderr:
------------------------------------------
5: @has check failed
`XPATH PATTERN` did not match
// @has foo/struct.Bar.html '//a[@href="../foo/struct.Foo.html"]' 'Foosdbf'
Encountered 1 errors
------------------------------------------
failures:
[rustdoc] rustdoc/check-styled-link.rs
test result: FAILED. 425 passed; 1 failed; 1 ignored; 0 measured; 0 filtered out; finished in 44.34s

@jyn514

jyn514 commented Mar 17, 2021

Copy link
Copy Markdown
Member

Ah sure. Need to uninstall tidy too.

FYI you can just remove it from path by running chmod -x /usr/bin/tidy. But uninstalling works too :)

@jyn514

jyn514 commented Mar 17, 2021

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Mar 17, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit ee98c6f has been approved by jyn514

@borsbors 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 Mar 17, 2021
@GuillaumeGomez

GuillaumeGomez commented Mar 17, 2021

Copy link
Copy Markdown
MemberAuthor

Ah sure. Need to uninstall tidy too.

FYI you can just remove it from path by running chmod -x /usr/bin/tidy. But uninstalling works too :)

Simply removing/putting back did the trick. Thanks for the info though! ;)

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 17, 2021
@Dylan-DPC
Rollup merge ofrust-lang#83228- GuillaumeGomez:no-diff-if-no-tidy, …
423fc34
…r=jyn514
Don't show HTML diff if tidy isn't installed for rustdoc tests
The output without the `tidy` tool is just way too big to be of any use. It makes reading the error much more complicated.
r? `@jyn514`
@Dylan-DPC-zzDylan-DPC-zz mentioned this pull request Mar 17, 2021
Closed
@Dylan-DPC-zzDylan-DPC-zz mentioned this pull request Mar 17, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 17, 2021
@bors
Auto merge ofrust-lang#83247- Dylan-DPC:rollup-bdwmvjg, r=Dylan-DPC
146f574
Rollup of 11 pull requests
Successful merges:
- rust-lang#82191 (Vec::dedup_by optimization)
- rust-lang#82270 (Emit error when trying to use assembler syntax directives in `asm!`)
- rust-lang#82434 (Add more links between hash and btree collections)
- rust-lang#83080 (Make source-based code coverage compatible with MIR inlining)
- rust-lang#83168 (Extend `proc_macro_back_compat` lint to `procedural-masquerade`)
- rust-lang#83192 (ci/docker: Add SDK/NDK level 21 to android docker for 32bit platforms)
- rust-lang#83204 (Simplify C compilation for Fortanix-SGX target)
- rust-lang#83216 (Allow registering tool lints with `register_tool`)
- rust-lang#83223 (Display error details when a `mmap` call fails)
- rust-lang#83228 (Don't show HTML diff if tidy isn't installed for rustdoc tests)
- rust-lang#83231 (Switch riscvgc-unknown-none-elf use lp64d ABI)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 22a9582 into rust-lang:masterMar 18, 2021
@rustbotrustbot added this to the 1.52.0 milestone Mar 18, 2021
@GuillaumeGomez
GuillaumeGomez deleted the no-diff-if-no-tidy branch March 18, 2021 09:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@jyn514jyn514

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.52.0

Development

Successfully merging this pull request may close these issues.

5 participants

@GuillaumeGomez@jyn514@bors@rust-highfive@rustbot