[EtomicBomb]

• Fixes bug that prevented using nested aux-build in tests/rustdoc/ tests. Before, fn document and the auxiliary builder disagreed about where to find the nested aux-build source file (auxiliary/auxiliary/aux.rs vs auxiliary/aux.rs), preventing them from building. Picked the latter in line with other builders in compiletest.
• Adds //@ doc-flags header, which forwards flags to rustdoc and not rustc.
• Adds //@ unique-doc-out-dir header, which sets the --out-dir for the rustdoc invocation to a unique directory: <root out dir>/docs/<test name>/doc
• Changes working directory of the rustdoc invocation to the root out directory (common among all aux-builds). Prior art: exec_compiled_test in runtest.rs
• Adds tests that use nested aux builds and new headers

These changes provide useful capabilities for writing rustdoc tests on their own. They are also needed to test the implementation for the mergable-rustdoc-cross-crate-info RFC.

try-job: x86_64-msvc

[rustbot]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @compiler-errors (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

• @rustbot author: the review is finished, PR author should check the comments and take action accordingly
• @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

[rustbot]

Some changes occurred in src/tools/compiletest

cc @jieyouxu

[compiler-errors]

This PR's history should be cleaned quite a lot, at least rebasing out all of the merge commits but also probably the useless commits that represent intermediate work states like "code from this morning".

r? rustdoc

[EtomicBomb]

Rebased the history! This is my first PR, so I'm just learning the ropes!

[notriddle]

AFAICT, this seems fine. In particular, I love these test cases!

I'm not as familiar with the deep guts of compiletest, though.

CC @jieyouxu

[notriddle]

Thank you for including a negative test here! 👍

Those things aren't common enough, and they should be.

[jieyouxu]

I'm not as familiar with the deep guts of compiletest, though.

CC @jieyouxu

I'll try to take a look tomorrow for the compiletest changes.

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

Sorry for the wait, I just got to this PR today. The compiletest changes LGTM for the most part, just a question about potential test revision interactions.

@bors r=notriddle

📌 Commit bd23e0e has been approved by notriddle

It is now in the queue for this repository.