diff options
| author | bors <bors@rust-lang.org> | 2024-07-19 16:13:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-19 16:13:37 +0000 |
| commit | 0cd01aac6a80735cc936f75b45e3545a5273e2ad (patch) | |
| tree | 121aa0aa2241cfb04e9d64d92e296f88e896f15f /src/ci/docker | |
| parent | 3811f40d2701b3a8923d2d46e36dd3a93a824b49 (diff) | |
| parent | 73db4e32f3906b2d32c0888d53731b85381150ad (diff) | |
| download | rust-0cd01aac6a80735cc936f75b45e3545a5273e2ad.tar.gz rust-0cd01aac6a80735cc936f75b45e3545a5273e2ad.zip | |
Auto merge of #127969 - matthiaskrgr:rollup-nhxmwhn, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #112328 (Feat. adding ext that returns change_time) - #126199 (Add `isqrt` to `NonZero<uN>`) - #127856 (interpret: add sanity check in dyn upcast to double-check what codegen does) - #127934 (Improve error when a compiler/library build fails in `checktools.sh`) - #127960 (Cleanup dll/exe filename calculations in `run_make_support`) - #127963 (Fix display of logo "border") - #127967 (Disable run-make/split-debuginfo test for RISC-V 64) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/docker')
| -rwxr-xr-x | src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh b/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh index 53b4583166d..a5a5acc333b 100755 --- a/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh @@ -8,6 +8,10 @@ X_PY="$1" # Try to test the toolstate-tracked tools and store the build/test success in the TOOLSTATE_FILE. +# Pre-build the compiler and the library first to output a better error message when the build +# itself fails (see https://github.com/rust-lang/rust/issues/127869 for context). +python3 "$X_PY" build --stage 2 compiler rustdoc + set +e python3 "$X_PY" test --stage 2 --no-fail-fast \ src/doc/book \ |