Skip to content

Simplify rustdoc-gui tester by calling directly browser-ui-test #146200

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Sep 7, 2025
Merged

Simplify rustdoc-gui tester by calling directly browser-ui-test #146200

merged 2 commits into from
Sep 7, 2025

Conversation

GuillaumeGomez
Copy link
Member

The output and handling of browser-ui-test is now mostly the same as we did manually, so no need to keep our wrapper anymore. Lot of code removed! \o/

r? @lolbinarycat

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool 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) T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Sep 4, 2025
@rustbot
Copy link
Collaborator

rustbot commented Sep 4, 2025

tidy extra checks were modified.

cc @lolbinarycat

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez GuillaumeGomez force-pushed the simplify-rustdoc-gui-tests branch from 42f6449 to d183b7e Compare September 4, 2025 15:07
@lolbinarycat
Copy link
Contributor

now that src/tools/rustdoc-gui is gone, we should remove mention of it from triagebot.toml.

besides that, it looks good, it seems the only thing tester.js was doing was concurrency and progress reporting, both of which browser-ui-test is fully capable of handling on its own.

i when testing this PR locally (to see what the new progress reporting looked like), i did encounter an issue with a spurious test failure, although that went away after ./x clean, so it looks like there is an issue with cache invalidation, which i believe is unrelated to this PR.

@rustbot author

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 4, 2025
@GuillaumeGomez GuillaumeGomez force-pushed the simplify-rustdoc-gui-tests branch from d183b7e to 1334066 Compare September 4, 2025 19:54
@rustbot rustbot added the A-meta Area: Issues & PRs about the rust-lang/rust repository itself label Sep 4, 2025
@rustbot
Copy link
Collaborator

rustbot commented Sep 4, 2025

triagebot.toml has been modified, there may have been changes to the review queue.

cc @davidtwco, @wesleywiser

@GuillaumeGomez
Copy link
Member Author

Good catch, thanks!

For caching issues, you mean that crates were not rebuilt or something else?

@GuillaumeGomez
Copy link
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 4, 2025
@lolbinarycat
Copy link
Contributor

For caching issues, you mean that crates were not rebuilt or something else?

it seemed like the doc dir got corrupted somehow, probably because it doesn't get cleaned before calling rustdoc, or because i did something weird with with git to mess up the file timestamps.

in any case, it's definitely unrelated to this change.

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 5, 2025

📌 Commit 1334066 has been approved by lolbinarycat

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 Sep 5, 2025
@GuillaumeGomez
Copy link
Member Author

@bors rollup

@fmease fmease mentioned this pull request Sep 5, 2025
Merged
bors added a commit that referenced this pull request Sep 5, 2025
@bors
Auto merge of #146255 - fmease:rollup-1v0kp8i, r=fmease
6c699a3 
Rollup of 11 pull requests

Successful merges:

 - #138944 (Add `__isPlatformVersionAtLeast` and `__isOSVersionAtLeast` symbols)
 - #139113 (unstable book: in a sanitizer example, check the code)
 - #145735 (style-guide: Document absence of trailing whitespace)
 - #146041 (tidy: --bless now makes escheck run with --fix)
 - #146144 (compiler: Apply target features to the entry function)
 - #146225 (Simplify `{f16, f32, f64, f128}::midpoint()`)
 - #146234 (change file-is-generated doc comment to inner)
 - #146241 (rustc_infer: change top-level doc comment to inner)
 - #146242 (Ensure that `--html-after-content` option is used to check `scrape_examples_ice` rustdoc GUI test)
 - #146243 (remove couple of redundant clones)
 - #146250 (Bump stage0 rustfmt)

Failed merges:

 - #146200 (Simplify rustdoc-gui tester by calling directly browser-ui-test)

r? `@ghost`
`@rustbot` modify labels: rollup
@tgross35 tgross35 mentioned this pull request Sep 6, 2025
Merged
bors added a commit that referenced this pull request Sep 6, 2025
@bors
Auto merge of #146258 - tgross35:rollup-4hqggwa, r=tgross35
545819d 
Rollup of 2 pull requests

Successful merges:

 - #146199 (Document Cargo with in-tree rustdoc)
 - #146257 (std: Update `wasi` crate dependency)

Failed merges:

 - #146200 (Simplify rustdoc-gui tester by calling directly browser-ui-test)

r? `@ghost`
`@rustbot` modify labels: rollup
@fmease
Copy link
Member

fmease commented Sep 6, 2025

merge conflict @bors r-

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

bors commented Sep 6, 2025

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

@GuillaumeGomez GuillaumeGomez force-pushed the simplify-rustdoc-gui-tests branch from 1334066 to b0a8e3c Compare September 6, 2025 18:34
@rustbot
Copy link
Collaborator

rustbot commented Sep 6, 2025

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@GuillaumeGomez
Copy link
Member Author

Fixed merge conflicts.

@GuillaumeGomez
Copy link
Member Author

@bors r=lolbinarycat

@bors
Copy link
Collaborator

bors commented Sep 6, 2025

📌 Commit b0a8e3c has been approved by lolbinarycat

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 Sep 6, 2025
@matthiaskrgr matthiaskrgr mentioned this pull request Sep 6, 2025
Merged
bors added a commit that referenced this pull request Sep 7, 2025
@bors
Auto merge of #146285 - matthiaskrgr:rollup-oaokoo3, r=matthiaskrgr
f4b2f68 
Rollup of 4 pull requests

Successful merges:

 - #146200 (Simplify rustdoc-gui tester by calling directly browser-ui-test)
 - #146236 (gpu offload: change suspicious map into filter)
 - #146240 (DynamicConfig: use canonical clone impl)
 - #146251 (rustc_middle: clippy fixes)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4b9b026 into rust-lang:master Sep 7, 2025
10 checks passed
@rustbot rustbot added this to the 1.91.0 milestone Sep 7, 2025
rust-timer added a commit that referenced this pull request Sep 7, 2025
@rust-timer
Unrolled build for #146200
1e3dadd 
Rollup merge of #146200 - GuillaumeGomez:simplify-rustdoc-gui-tests, r=lolbinarycat

Simplify rustdoc-gui tester by calling directly browser-ui-test

The output and handling of `browser-ui-test` is now mostly the same as we did manually, so no need to keep our wrapper anymore. Lot of code removed! \o/

r? `@lolbinarycat`
@GuillaumeGomez GuillaumeGomez deleted the simplify-rustdoc-gui-tests branch September 7, 2025 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@lolbinarycat lolbinarycat

Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool 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) T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.91.0
Development

Successfully merging this pull request may close these issues.
6 participants
@GuillaumeGomez @rustbot @rust-log-analyzer @lolbinarycat @bors @fmease