diff options
| author | bors <bors@rust-lang.org> | 2025-09-06 18:37:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-06 18:37:35 +0000 |
| commit | 1ed3cd7030718935a5c5e5c8f6581f36d8be179f (patch) | |
| tree | b5a9ff47a9451f3b2e6ac7c3a91eb9c7dfe71e93 /triagebot.toml | |
| parent | bea625f3275e3c897dc965ed97a1d19ef7831f01 (diff) | |
| parent | f755e64c36edf552a222a165fca3027f1063c817 (diff) | |
| download | rust-1ed3cd7030718935a5c5e5c8f6581f36d8be179f.tar.gz rust-1ed3cd7030718935a5c5e5c8f6581f36d8be179f.zip | |
Auto merge of #146233 - jieyouxu:run-make-fission, r=Kobzol
Split `run-make` into two {`run-make`,`run-make-cargo`} test suites
## Summary
Split `tests/run-make` into two test suites, to make it faster and more convenient for contributors to run run-make tests that do not need in-tree `cargo`.
| New test suites | Explanation |
| ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `tests/run-make` | The "fast path" test suite intended for run-make tests that do not need in-tree `cargo`. These tests may not use `cargo`. |
| `tests/run-make-cargo` | The "slow path" test suite that requires checking out `cargo` submodule and building in-tree `cargo`, and thus will have access to in-tree `cargo`. In practice, these constitute a very small portion of the original `run-make` tests. |
This PR carries out [MCP 847: Split run-make test suite into slower-building test suite with suitably-staged cargo and faster-building test suite without cargo](https://github.com/rust-lang/compiler-team/issues/847).
Fixes rust-lang/rust#135573 (for the tests that do not need in-tree `cargo`).
Fixes rust-lang/rust#134109.
## Remarks
- I considered if we want to split by in-tree tools previously. However, as discussed rust-lang/rust#134109, in practice `rustdoc` is not very slow to build, but `cargo` takes a good few minutes. So, the partition boundary was determined to be along in-tree `cargo` availability.
- The `run-make` tests previously that wanted to use `cargo` cannot just use the bootstrap `cargo`, otherwise they would run into situations where bootstrap `cargo` can significantly diverge from in-tree `cargo` (see https://github.com/rust-lang/rust/pull/130642).
---
try-job: aarch64-msvc-1
try-job: test-various
try-job: x86_64-gnu-debug
try-job: aarch64-gnu-debug
try-job: aarch64-apple
try-job: dist-various-1
Diffstat (limited to 'triagebot.toml')
| -rw-r--r-- | triagebot.toml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/triagebot.toml b/triagebot.toml index 6924ed4a0d9..77aa549f6aa 100644 --- a/triagebot.toml +++ b/triagebot.toml @@ -336,6 +336,7 @@ trigger_files = [ "tests/mir-opt", "tests/pretty", "tests/run-make", + "tests/run-make-cargo", "tests/ui", "tests/ui-fulldeps", ] @@ -593,6 +594,7 @@ trigger_files = [ [autolabel."A-run-make"] trigger_files = [ "tests/run-make", + "tests/run-make-cargo", "src/tools/run-make-support" ] @@ -1543,6 +1545,7 @@ dep-bumps = [ "/src/rustdoc-json-types" = ["rustdoc"] "/src/stage0" = ["bootstrap"] "/tests/run-make" = ["@jieyouxu"] +"/tests/run-make-cargo" = ["@jieyouxu"] "/tests/rustdoc" = ["rustdoc"] "/tests/rustdoc-gui" = ["rustdoc"] "/tests/rustdoc-js-std" = ["rustdoc"] |