From 48207d6ea64ac0e9b7d880923b9ed4bc77b6d3bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?HNO=E2=82=83?= Date: Sat, 10 Oct 2026 23:57:27 +0800 Subject: [PATCH] bootstrap: keep intrinsic-test path compatibility --- src/bootstrap/src/core/build_steps/test.rs | 3 ++- src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap | 1 + .../src/core/builder/cli_paths/snapshots/x_test_library.snap | 3 +++ .../snapshots/x_test_library_core_and_alloc_and_stdarch.snap | 3 +++ .../core/builder/cli_paths/snapshots/x_test_skip_coverage.snap | 1 + .../builder/cli_paths/snapshots/x_test_skip_coverage_map.snap | 1 + .../builder/cli_paths/snapshots/x_test_skip_coverage_run.snap | 1 + .../core/builder/cli_paths/snapshots/x_test_skip_tests.snap | 1 + .../cli_paths/snapshots/x_test_skip_tests_coverage.snap | 1 + 9 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs index c532b670dbef1..846c8866998b4 100644 --- a/src/bootstrap/src/core/build_steps/test.rs +++ b/src/bootstrap/src/core/build_steps/test.rs @@ -1075,7 +1075,8 @@ impl CommandLineStep for IntrinsicTest { const IS_HOST: bool = true; fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { - run.alias("intrinsic-test") + // Keep accepting the historical path used by external CI jobs. + run.path("library/stdarch/crates/intrinsic-test").alias("intrinsic-test") } fn is_default_step(_builder: &Builder<'_>) -> bool { diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap index 6612faf9d0e00..f957735d75af7 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap @@ -226,3 +226,4 @@ expression: test [Test] test::IntrinsicTest targets: [x86_64-unknown-linux-gnu] - Set({intrinsic-test}) + - Set({library/stdarch/crates/intrinsic-test}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_library.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_library.snap index 0d6c34daacf0a..413ec960694ed 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_library.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_library.snap @@ -21,3 +21,6 @@ expression: test library [Test] test::StdarchVerify targets: [x86_64-unknown-linux-gnu] - Set({library/stdarch/crates/stdarch-verify}) +[Test] test::IntrinsicTest + targets: [x86_64-unknown-linux-gnu] + - Set({library/stdarch/crates/intrinsic-test}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_library_core_and_alloc_and_stdarch.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_library_core_and_alloc_and_stdarch.snap index ad349efdde6e7..75682fa5b85db 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_library_core_and_alloc_and_stdarch.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_library_core_and_alloc_and_stdarch.snap @@ -9,3 +9,6 @@ expression: test library/core library/alloc library/stdarch [Test] test::StdarchVerify targets: [x86_64-unknown-linux-gnu] - Set({library/stdarch/crates/stdarch-verify}) +[Test] test::IntrinsicTest + targets: [x86_64-unknown-linux-gnu] + - Set({library/stdarch/crates/intrinsic-test}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap index cfea3b0825d0a..e41d1057478a5 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap @@ -223,3 +223,4 @@ expression: test --skip=coverage [Test] test::IntrinsicTest targets: [x86_64-unknown-linux-gnu] - Set({intrinsic-test}) + - Set({library/stdarch/crates/intrinsic-test}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_map.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_map.snap index e9833dee88f26..2269d67c87d69 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_map.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_map.snap @@ -226,3 +226,4 @@ expression: test --skip=coverage-map [Test] test::IntrinsicTest targets: [x86_64-unknown-linux-gnu] - Set({intrinsic-test}) + - Set({library/stdarch/crates/intrinsic-test}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_run.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_run.snap index 9f30a345b4fbc..c418cc4ea70e7 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_run.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_run.snap @@ -226,3 +226,4 @@ expression: test --skip=coverage-run [Test] test::IntrinsicTest targets: [x86_64-unknown-linux-gnu] - Set({intrinsic-test}) + - Set({library/stdarch/crates/intrinsic-test}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests.snap index df818a6132732..76aa9d556f194 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests.snap @@ -166,3 +166,4 @@ expression: test --skip=tests [Test] test::IntrinsicTest targets: [x86_64-unknown-linux-gnu] - Set({intrinsic-test}) + - Set({library/stdarch/crates/intrinsic-test}) diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_coverage.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_coverage.snap index f8efe9e31631b..62eb3ad256b5a 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_coverage.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_coverage.snap @@ -223,3 +223,4 @@ expression: test --skip=tests/coverage [Test] test::IntrinsicTest targets: [x86_64-unknown-linux-gnu] - Set({intrinsic-test}) + - Set({library/stdarch/crates/intrinsic-test})