Make `x test distcheck` self-contained #145845

Kobzol · 2025-08-25T10:10:44Z

Before, the checked components were extracted under the checked out source root, which caused us to test some weird combination of tarball + checkout sources/aritfacts/configuration.

Now x test distcheck works with an external temporary directory instead, which should make it self-contained. I also moved some config from the Dockerfile to the test itself, and fixed an issue in tidy that caused x test tidy to fail on tarball sources.

I also removed .args(&builder.config.configure_args), because it was passing all kinds of crap from the CI config to the distcheck step, which was making it less reproducible.

Fixes: #145183

r? @jieyouxu

try-job: x86_64-gnu-distcheck

rustbot · 2025-08-25T10:10:49Z

jieyouxu is currently at their maximum review capacity.
They may take a while to respond.

Kobzol · 2025-08-25T10:11:49Z

@bors try

Make `x test distcheck` self-contained try-job: x86_64-gnu-distcheck

Kobzol · 2025-08-25T10:32:22Z

@bors try

Make `x test distcheck` self-contained try-job: x86_64-gnu-distcheck

rust-bors · 2025-08-25T10:55:33Z

💔 Test for 55a0a59 failed: CI. Failed jobs:

try - x86_64-gnu-distcheck (web logs, extended logs)

Kobzol · 2025-08-25T11:39:49Z

@bors try

Make `x test distcheck` self-contained try-job: x86_64-gnu-distcheck

rust-bors · 2025-08-25T13:33:08Z

☀️ Try build successful (CI)
Build commit: 2405121 (240512113774c099bd4e679e1c48f5b263be9986, parent: ee361e8fca1c30e13e7a31cc82b64c045339d3a8)

Kobzol · 2025-08-25T13:34:39Z

@bors try

Make `x test distcheck` self-contained try-job: x86_64-gnu-distcheck

Kobzol · 2025-08-25T13:35:45Z

Ok, should be ready for a review.

jieyouxu

Two questions

View changes since this review

src/bootstrap/src/lib.rs

src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile

jieyouxu

Thanks

View changes since this review

jieyouxu · 2025-08-25T14:22:47Z

r=me if try job is 🍏

rust-bors · 2025-08-25T15:12:27Z

☀️ Try build successful (CI)
Build commit: 7d64c82 (7d64c82728413624dc8e8001957ab7c855bc5676, parent: ee361e8fca1c30e13e7a31cc82b64c045339d3a8)

Kobzol · 2025-08-25T15:15:01Z

@bors r=jieyouxu

bors · 2025-08-25T15:15:04Z

📌 Commit 2ea8621 has been approved by jieyouxu

It is now in the queue for this repository.

Make `x test distcheck` self-contained Before, the checked components were extracted under the checked out source root, which caused us to test some weird combination of tarball + checkout sources/aritfacts/configuration. Now `x test distcheck` works with an external temporary directory instead, which should make it self-contained. I also moved some config from the Dockerfile to the test itself, and fixed an issue in tidy that caused `x test tidy` to fail on tarball sources. I also removed `.args(&builder.config.configure_args)`, because it was passing all kinds of crap from the CI config to the distcheck step, which was making it less reproducible. Fixes: rust-lang#145183 r? `@jieyouxu` try-job: x86_64-gnu-distcheck

Rollup of 12 pull requests Successful merges: - #143193 (Port `#[link]` to the new attribute parsing infrastructure ) - #144373 (remove deprecated Error::description in impls) - #144885 (Implement some more checks in `ptr_guaranteed_cmp`. ) - #145535 (make rustdoc::invalid_html_tags more robust) - #145766 (test(rustfmt): Verify frontmatter is preserved) - #145811 (Fix some minor issues in comments) - #145814 (Handle unwinding fatal errors in codegen workers) - #145815 (Wait for DPkg frontend lock when trying to remove packages) - #145821 (compiletest: if a compiler fails, show its output) - #145845 (Make `x test distcheck` self-contained) - #145847 (Don't show warnings from xcrun with -Zverbose-internals) - #145856 (Update books) r? `@ghost` `@rustbot` modify labels: rollup

Make `x test distcheck` self-contained Before, the checked components were extracted under the checked out source root, which caused us to test some weird combination of tarball + checkout sources/aritfacts/configuration. Now `x test distcheck` works with an external temporary directory instead, which should make it self-contained. I also moved some config from the Dockerfile to the test itself, and fixed an issue in tidy that caused `x test tidy` to fail on tarball sources. I also removed `.args(&builder.config.configure_args)`, because it was passing all kinds of crap from the CI config to the distcheck step, which was making it less reproducible. Fixes: rust-lang#145183 r? ``@jieyouxu`` try-job: x86_64-gnu-distcheck

Rollup of 13 pull requests Successful merges: - #143193 (Port `#[link]` to the new attribute parsing infrastructure ) - #143689 (Allow linking a prebuilt optimized compiler-rt builtins library) - #144885 (Implement some more checks in `ptr_guaranteed_cmp`. ) - #145535 (make rustdoc::invalid_html_tags more robust) - #145766 (test(rustfmt): Verify frontmatter is preserved) - #145811 (Fix some minor issues in comments) - #145814 (Handle unwinding fatal errors in codegen workers) - #145815 (Wait for DPkg frontend lock when trying to remove packages) - #145821 (compiletest: if a compiler fails, show its output) - #145845 (Make `x test distcheck` self-contained) - #145847 (Don't show warnings from xcrun with -Zverbose-internals) - #145856 (Update books) - #145858 (Update wasm-component-ld dependency) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 12 pull requests Successful merges: - #143689 (Allow linking a prebuilt optimized compiler-rt builtins library) - #144885 (Implement some more checks in `ptr_guaranteed_cmp`. ) - #145535 (make rustdoc::invalid_html_tags more robust) - #145766 (test(rustfmt): Verify frontmatter is preserved) - #145811 (Fix some minor issues in comments) - #145814 (Handle unwinding fatal errors in codegen workers) - #145815 (Wait for DPkg frontend lock when trying to remove packages) - #145821 (compiletest: if a compiler fails, show its output) - #145845 (Make `x test distcheck` self-contained) - #145847 (Don't show warnings from xcrun with -Zverbose-internals) - #145856 (Update books) - #145858 (Update wasm-component-ld dependency) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #145845 - Kobzol:fix-distcheck, r=jieyouxu Make `x test distcheck` self-contained Before, the checked components were extracted under the checked out source root, which caused us to test some weird combination of tarball + checkout sources/aritfacts/configuration. Now `x test distcheck` works with an external temporary directory instead, which should make it self-contained. I also moved some config from the Dockerfile to the test itself, and fixed an issue in tidy that caused `x test tidy` to fail on tarball sources. I also removed `.args(&builder.config.configure_args)`, because it was passing all kinds of crap from the CI config to the distcheck step, which was making it less reproducible. Fixes: #145183 r? ```@jieyouxu``` try-job: x86_64-gnu-distcheck

Rollup of 12 pull requests Successful merges: - rust-lang/rust#143689 (Allow linking a prebuilt optimized compiler-rt builtins library) - rust-lang/rust#144885 (Implement some more checks in `ptr_guaranteed_cmp`. ) - rust-lang/rust#145535 (make rustdoc::invalid_html_tags more robust) - rust-lang/rust#145766 (test(rustfmt): Verify frontmatter is preserved) - rust-lang/rust#145811 (Fix some minor issues in comments) - rust-lang/rust#145814 (Handle unwinding fatal errors in codegen workers) - rust-lang/rust#145815 (Wait for DPkg frontend lock when trying to remove packages) - rust-lang/rust#145821 (compiletest: if a compiler fails, show its output) - rust-lang/rust#145845 (Make `x test distcheck` self-contained) - rust-lang/rust#145847 (Don't show warnings from xcrun with -Zverbose-internals) - rust-lang/rust#145856 (Update books) - rust-lang/rust#145858 (Update wasm-component-ld dependency) r? `@ghost` `@rustbot` modify labels: rollup

Kobzol added 2 commits August 25, 2025 12:03

Make x test distcheck more self-contained

a3229e4

Handle tarballs in x test tidy

89f9cf3

rustbot assigned jieyouxu Aug 25, 2025

rust-bors bot added a commit that referenced this pull request Aug 25, 2025

Auto merge of #145845 - Kobzol:fix-distcheck, r=<try>

a3c7909

Make `x test distcheck` self-contained try-job: x86_64-gnu-distcheck

This comment has been minimized.

Sign in to view

Do not forward CI configure arguments to distcheck builds

8fa5fc6

rust-bors bot added a commit that referenced this pull request Aug 25, 2025

Auto merge of #145845 - Kobzol:fix-distcheck, r=<try>

55a0a59

Make `x test distcheck` self-contained try-job: x86_64-gnu-distcheck

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Aug 25, 2025

Auto merge of #145845 - Kobzol:fix-distcheck, r=<try>

2405121

Make `x test distcheck` self-contained try-job: x86_64-gnu-distcheck

This comment has been minimized.

Sign in to view

Override GITHUB_ACTIONS=0 for tidy tests

2ea8621

Kobzol force-pushed the fix-distcheck branch from 317fa4c to 2ea8621 Compare August 25, 2025 12:10

rust-bors bot added a commit that referenced this pull request Aug 25, 2025

Auto merge of #145845 - Kobzol:fix-distcheck, r=<try>

7d64c82

Make `x test distcheck` self-contained try-job: x86_64-gnu-distcheck

This comment has been minimized.

Sign in to view

jieyouxu reviewed Aug 25, 2025

View reviewed changes

src/bootstrap/src/lib.rs Show resolved Hide resolved

src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile Show resolved Hide resolved

jieyouxu approved these changes Aug 25, 2025

View reviewed changes

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 Aug 25, 2025

jhpratt mentioned this pull request Aug 25, 2025

Rollup of 12 pull requests #145860

Closed

Zalathar mentioned this pull request Aug 26, 2025

Rollup of 13 pull requests #145865

Closed

Zalathar mentioned this pull request Aug 26, 2025

Rollup of 12 pull requests #145871

Merged

bors merged commit d196639 into rust-lang:master Aug 26, 2025
11 checks passed

rustbot added this to the 1.91.0 milestone Aug 26, 2025

Kobzol deleted the fix-distcheck branch August 26, 2025 11:36

Uh oh!

Make x test distcheck self-contained #145845

Make x test distcheck self-contained #145845

Conversation

Kobzol commented Aug 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Aug 25, 2025

Uh oh!

Kobzol commented Aug 25, 2025

Uh oh!

This comment has been minimized.

Kobzol commented Aug 25, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rust-bors bot commented Aug 25, 2025

Uh oh!

Kobzol commented Aug 25, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors bot commented Aug 25, 2025

Uh oh!

Kobzol commented Aug 25, 2025

Uh oh!

This comment has been minimized.

Kobzol commented Aug 25, 2025

Uh oh!

jieyouxu left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jieyouxu left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Aug 25, 2025

Uh oh!

rust-bors bot commented Aug 25, 2025

Uh oh!

Kobzol commented Aug 25, 2025

Uh oh!

bors commented Aug 25, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Make `x test distcheck` self-contained #145845

Make `x test distcheck` self-contained #145845

Kobzol commented Aug 25, 2025 •

edited

Loading

jieyouxu left a comment •

edited by rustbot

Loading

jieyouxu left a comment •

edited by rustbot

Loading