Skip to content

Move more rustdoc-html tests using --test into the right folder - #162014

Open
GuillaumeGomez wants to merge 6 commits into
rust-lang:mainfrom
GuillaumeGomez:more-ui-tests
Open

Move more rustdoc-html tests using --test into the right folder#162014
GuillaumeGomez wants to merge 6 commits into
rust-lang:mainfrom
GuillaumeGomez:more-ui-tests

Conversation

@GuillaumeGomez

@GuillaumeGomez GuillaumeGomez commented Aug 30, 2026

Copy link
Copy Markdown
Member

View all comments

Follow-up of #161944.

I double-checked if more rustdoc-html tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in compiletest I guess, doesn't seem like a tidy thing).

Oh also second commit is me realizing that some ui tests were using compile-args (which doesn't exist anymore) and without @. Anyway, fixed that too.

r? @fmease

@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 Aug 30, 2026

@fmease fmease left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

review of 1st commit

View changes since this review

Comment thread tests/rustdoc-ui/doctest/async-move-doctest.stdout Outdated
Comment thread tests/rustdoc-ui/doctest/comment-in-doctest.stdout Outdated
Comment thread tests/rustdoc-ui/doctest/edition-doctest.stdout Outdated
Comment thread tests/rustdoc-ui/doctest/force-target-feature.rs Outdated
Comment thread tests/rustdoc-ui/doctest/force-target-feature.rs

@fmease fmease left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice! Thanks a lot!

I wonder if we should at some point modify compiletest or extend tidy to error on rustdoc-html/ tests that don't contain any HtmlDocCk directives... hmm, maybe that's a horrible idea

r=me once nits addressed

View changes since this review

Comment thread tests/rustdoc-ui/lints/renamed-lint-still-applies.rs Outdated
Comment thread tests/ui/lint/forbid-error-capped.rs Outdated
@fmease fmease 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 Aug 30, 2026
@GuillaumeGomez

Copy link
Copy Markdown
Member Author

I wonder if we should modify compiletest or extend tidy to error on rustdoc-html/ tests that don't contain any HtmlDocCk directives... hmm, maybe that's a horrible idea

On it. ;)

I'll send a patch to prevent that in the future (in compiletest I guess, doesn't seem like a tidy thing).

@@ -1,5 +1,4 @@
//@ check-pass
// compile-args: --cap-lints=warn -Fwarnings

@fmease fmease Aug 30, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Wait, this should be converted to //@ compile-flags like you did before. This test specifically intended to test the interaction between --cap-lints=warn and -Fwarnings as the paragraph states below.

Or did that lead to a failure? If so we might want to open a GH issue & investigate further.

View changes since the review

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@GuillaumeGomez GuillaumeGomez Sep 2, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I was confused because the test was expecting WARN messages. But based on the test description, it shouldn't. So I removed the WARN annotations and uncommented the line.

@fmease fmease Aug 30, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Accidental removal while trying to apply #162014 (comment) (there's still the corresp. *.stderr file)?.

View changes since the review

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

#162014 (comment)

This has not been addressed yet.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Arf indeed, fixed.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez

Copy link
Copy Markdown
Member Author

@bors r=fmease rollup

@rust-bors

rust-bors Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 614d9ea has been approved by fmease

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Aug 31, 2026
@rust-bors rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 31, 2026
@rustbot

rustbot commented Aug 31, 2026

Copy link
Copy Markdown
Collaborator

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@rust-bors rust-bors Bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 31, 2026
@rust-bors

rust-bors Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

⚠️ A new commit fa9cd5bd4c583c3b5311698485482ad514026c30 was pushed.

This pull request was unapproved.

@rust-bors rust-bors Bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 1, 2026
@rust-bors

rust-bors Bot commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved.

This PR was contained in a rollup (#162139), which was unapproved.

View changes since this unapproval

@GuillaumeGomez

Copy link
Copy Markdown
Member Author

Arf, a test stdout was only generated on mac. Talk about bad luck. :')

@bors try jobs=aarch64-apple-1

@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Sep 1, 2026
Move more `rustdoc-html` tests using `--test` into the right folder


try-job: aarch64-apple-1
@rust-bors

rust-bors Bot commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 0878440 (08784406009b5f42c6a6fe27bd3a37e454f83d55)
Base parent: a433023 (a4330234a776684c36428d001721d0320d24dd77)

@fmease fmease left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Two comments have not been addressed yet:

  1. #162014 (comment)
  2. #162014 (comment)

View changes since this review

@@ -1,5 +1,4 @@
//@ check-pass
// compile-args: --cap-lints=warn -Fwarnings

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

#162014 (comment)

This has not been addressed yet.

@fmease fmease left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks! Fingers crossed this finally makes it 🤞 @bors r+

View changes since this review

@rust-bors

rust-bors Bot commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 2de1645 has been approved by fmease

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 2, 2026
@fmease

fmease commented Sep 2, 2026

Copy link
Copy Markdown
Member

@bors rollup=iffy

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Sep 2, 2026
…ease

Move more `rustdoc-html` tests using `--test` into the right folder

Follow-up of rust-lang#161944.

I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing).

Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too.

r? @fmease
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Sep 2, 2026
…ease

Move more `rustdoc-html` tests using `--test` into the right folder

Follow-up of rust-lang#161944.

I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing).

Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too.

r? @fmease
@JonathanBrouwer

Copy link
Copy Markdown
Member

💔 I suspect this PR failed tests as part of a rollup
@bors r-

After fixing the problem, consider running a try job for the failed job before re-approving.

Link to failure: #162206 (comment)

@rust-bors rust-bors Bot 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 Sep 2, 2026
@rust-bors

rust-bors Bot commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved.

This PR was contained in a rollup (#162206), which was unapproved.

View changes since this unapproval

@fmease

fmease commented Sep 2, 2026

Copy link
Copy Markdown
Member

Probably needs a lot more aggressive backtrace normalization (do we have UI tests we can take as inspiration?)

@GuillaumeGomez

Copy link
Copy Markdown
Member Author

I can finally show my regex skills =D (please make this nightmare stop T_T)

@GuillaumeGomez

Copy link
Copy Markdown
Member Author

Oh, even simpler: only-linux. :3

@GuillaumeGomez

Copy link
Copy Markdown
Member Author

@bors try jobs=x86_64-msvc-1

@rust-bors

rust-bors Bot commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

⌛ Trying commit c7a87d0 with merge 29c96bd

To cancel the try build, run the command @bors try cancel.

Workflow: https://github.com/rust-lang/rust/actions/runs/33676268084

rust-bors Bot pushed a commit that referenced this pull request Sep 2, 2026
Move more `rustdoc-html` tests using `--test` into the right folder


try-job: x86_64-msvc-1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants