Rename tests/rustdoc into tests/rustdoc-html
#150645
Conversation
rustbot
added
A-CI
This comment has been minimized.
This comment has been minimized.
GuillaumeGomez
force-pushed
the
rename-rustdoc-tests
branch
from
e2f1bcc to
29e47c2
Compare
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Could you please also update the dev-guide in this PR (in a separate commit is fine) which is a subtree in this repo, namely in src/doc/rustc-dev-guide/.
E.g., renaming src/doc/rustc-dev-guide/src/rustdoc-internals/rustdoc-test-suite.md to src/doc/rustc-dev-guide/src/rustdoc-internals/rustdoc-html-test-suite.md & updating chapter name, link texts etc. Highly appreciated! :)
|
Sure! |
GuillaumeGomez
force-pushed
the
rename-rustdoc-tests
branch
from
29e47c2 to
ccbf24e
Compare
|
The rustc-dev-guide subtree was changed. If this PR only touches the dev guide consider submitting a PR directly to rust-lang/rustc-dev-guide otherwise thank you for updating the dev guide with your changes. |
GuillaumeGomez
force-pushed
the
rename-rustdoc-tests
branch
from
ccbf24e to
2254355
Compare
|
|
There was a problem hiding this comment.
As you can see from the test expectation changes, running ./x test librustdoc rustdoc no longer tests tests/rustdoc (since it no longer exists).
You should update the expression from rustdoc to rustdoc-html, rename this file and rebless the snap. Similarly for the other test file.
There was a problem hiding this comment.
(If we ever introduce rustdoc as an alias for all rustdoc-* test suites, we can change the rustdoc-html back to rustdoc in these two tests (or just keep them and add new ones))
| [build] rustc 0 <host> -> RustdocGUITest 1 <host> | ||
| [test] rustdoc-gui 1 <host> | ||
| [test] compiletest-incremental 1 <host> | ||
| [build] rustc 1 <host> -> rustc 2 <host> |
There was a problem hiding this comment.
Hmm, I'm slightly worried about this disappearing... I don't see why that has happened (similarly for the other tests in this file). I haven't looked closely at these tests & I'm not super familar with bootstrap's innards, so I might be missing sth.
There was a problem hiding this comment.
Let's wait for @Kobzol to have a look to ensure I didn't break something.
There was a problem hiding this comment.
I suspect this is because x test rustdoc also tries to run unit tests for src/tools/rustdoc, despite that being a stub crate with no tests in it.
There was a problem hiding this comment.
Actually, looking at the results of running x test src/tools/rustdoc on main, I have no idea what's going on. 🤷♂️
There was a problem hiding this comment.
Ah, x test src/tools/rustdoc is effectively treated as an alias for x test src/librustdoc, so it's running the unit tests and doctests for src/librustdoc.
This comment has been minimized.
This comment has been minimized.
GuillaumeGomez
force-pushed
the
rename-rustdoc-tests
branch
from
2254355 to
324ccf0
Compare
| (x_test_librustdoc_rustdoc, "test librustdoc rustdoc"), | ||
| (x_test_rustdoc, "test rustdoc"), |
There was a problem hiding this comment.
IMO we should leave these two lines untouched, and instead add a new line for (x_test_rustdoc_html, "test rustdoc-html").
There was a problem hiding this comment.
The primary purpose of these existing lines is to capture the weird aliasing behaviour of src/librustdoc and src/tools/rustdoc, so it’s expected that renaming tests/rustdoc will affect the snapshots.
|
☔ The latest upstream changes (presumably #150640) made this pull request unmergeable. Please resolve the merge conflicts. |
|
☔ The latest upstream changes made this pull request unmergeable. Please resolve the merge conflicts. |
8 participants
As discussed on zulip, renaming this testsuite better reflects what they actually test. Later on, it could also allow us to add an alias to run all rustdoc tests at once.
r? @camelid