diff --git a/rust-version b/rust-version index 386fb6f98c..18fea43674 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -71238e21fc55e73ab3aad8c9f79fed7a47a179e1 +32d94cc9be3f6e6c3fa1deaea9e0ab93c4980dba diff --git a/src/tests/autodiff-ci-job.md b/src/tests/autodiff-ci-job.md index b4707918bd..28f7ef1740 100644 --- a/src/tests/autodiff-ci-job.md +++ b/src/tests/autodiff-ci-job.md @@ -1,6 +1,6 @@ # Autodiff CI job -The [`optional-x86_64-gnu-autodiff`] job provides continuous test coverage for +The [`optional-test-x86_64-gnu-autodiff`] job provides continuous test coverage for the experimental `autodiff` feature and its integration with LLVM Enzyme. It is an optional [auto job](./ci.md#auto-builds), so a failure does not prevent a pull request from being merged. @@ -41,4 +41,4 @@ For suspected Enzyme backend failures, see the [autodiff debugging guide]. [autodiff Zulip channel]: https://rust-lang.zulipchat.com/#narrow/channel/390790-wg-autodiff [autodiff debugging guide]: ../autodiff/debugging.md [autodiff tracking issue]: https://github.com/rust-lang/rust/issues/124509 -[`optional-x86_64-gnu-autodiff`]: https://github.com/rust-lang/rust/blob/HEAD/src/ci/github-actions/jobs.yml +[`optional-test-x86_64-gnu-autodiff`]: https://github.com/rust-lang/rust/blob/HEAD/src/ci/github-actions/jobs.yml diff --git a/src/tests/ci.md b/src/tests/ci.md index 31c6949d85..7f3c38385c 100644 --- a/src/tests/ci.md +++ b/src/tests/ci.md @@ -66,8 +66,8 @@ kinds of builds (sets of jobs). ### Pull Request builds After each push to a pull request, a set of `pr` jobs are executed. -Currently, these execute the `x86_64-gnu-llvm-X`, `x86_64-gnu-tools`, `pr-check-1`, `pr-check-2` -and `tidy` jobs, all running on Linux. +Currently, these execute the `test-x86_64-gnu-llvm-X`, `test-x86_64-gnu-tools`, `test-pr-check-1`, `test-pr-check-2` +and `test-tidy` jobs, all running on Linux. These execute a relatively short (~40 minutes) and lightweight test suite that should catch common issues. More specifically, they run a set of lints, they try to perform a cross-compile check @@ -253,11 +253,11 @@ to your PR, like this: ```yaml pr: ... - - image: x86_64-gnu-tools + - image: test-x86_64-gnu-tools <<: *job-linux-16c # this item was copied from the `auto` section # vvvvvvvvvvvvvvvvvv - - image: x86_64-msvc + - image: test-x86_64-msvc env: RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler SCRIPT: make ci-msvc diff --git a/src/tests/codegen-backend-tests/cg_gcc.md b/src/tests/codegen-backend-tests/cg_gcc.md index 9ed91550b2..9c9526989f 100644 --- a/src/tests/codegen-backend-tests/cg_gcc.md +++ b/src/tests/codegen-backend-tests/cg_gcc.md @@ -9,7 +9,7 @@ Note that the backend currently only supports the `x86_64-unknown-linux-gnu` tar ## Running into GCC backend CI errors -If you ran into an error related to tests executed with the GCC codegen backend on CI in the `x86_64-gnu-gcc` job, +If you ran into an error related to tests executed with the GCC codegen backend on CI in the `test-x86_64-gnu-gcc` job, you can use the following command to run UI tests locally using the GCC backend, which reproduces what happens on CI: ```bash @@ -21,7 +21,7 @@ you can use the following command to run UI tests locally using the GCC backend, If a different test suite has failed on CI, you will have to modify the `tests/ui` part. -To reproduce the whole CI job locally, you can run `cargo run --manifest-path src/ci/citool/Cargo.toml run-local x86_64-gnu-gcc`. +To reproduce the whole CI job locally, you can run `cargo run --manifest-path src/ci/citool/Cargo.toml run-local test-x86_64-gnu-gcc`. See [Testing with Docker](../docker.md) for more information. ### What to do in case of a GCC job failure? diff --git a/src/tests/directives.md b/src/tests/directives.md index cca649fbfd..5a3ec15d00 100644 --- a/src/tests/directives.md +++ b/src/tests/directives.md @@ -231,8 +231,8 @@ The following directives will check LLVM support: `COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS` is set) if the component does not exist. - `needs-forced-clang-based-tests` — test is ignored unless the environment variable `RUSTBUILD_FORCE_CLANG_BASED_TESTS` is set, which enables building clang alongside LLVM - - This is only set in two CI jobs ([`x86_64-gnu-debug`] and - [`aarch64-gnu-debug`]), which only runs a subset of `run-make` tests. + - This is only set in two CI jobs ([`test-x86_64-gnu-debug`] and + [`test-aarch64-gnu-debug`]), which only runs a subset of `run-make` tests. Other tests with this directive will not run at all, which is usually not what you want. See also [Debuginfo tests](compiletest.md#debuginfo-tests) for directives for ignoring debuggers. @@ -240,8 +240,8 @@ See also [Debuginfo tests](compiletest.md#debuginfo-tests) for directives for ig [remote testing]: running.md#running-tests-on-a-remote-machine [parallel frontend]: compiletest.md#parallel-frontend [compare modes]: ui.md#compare-modes -[`x86_64-gnu-debug`]: https://github.com/rust-lang/rust/blob/ab3dba92db355b8d97db915a2dca161a117e959c/src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile#L32 -[`aarch64-gnu-debug`]: https://github.com/rust-lang/rust/blob/20c909ff9cdd88d33768a4ddb8952927a675b0ad/src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile#L32 +[`test-x86_64-gnu-debug`]: https://github.com/rust-lang/rust/blob/ab3dba92db355b8d97db915a2dca161a117e959c/src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile#L32 +[`test-aarch64-gnu-debug`]: https://github.com/rust-lang/rust/blob/20c909ff9cdd88d33768a4ddb8952927a675b0ad/src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile#L32 ### Affecting how tests are built diff --git a/src/tests/optional-x86_64-gnu-parallel-frontend.md b/src/tests/optional-x86_64-gnu-parallel-frontend.md index 20dc5adeaa..bfabce1dc2 100644 --- a/src/tests/optional-x86_64-gnu-parallel-frontend.md +++ b/src/tests/optional-x86_64-gnu-parallel-frontend.md @@ -1,8 +1,6 @@ # Parallel frontend testing on CI -NOTE: this job is optional and allowed to fail. - -If you see any test failures in `tests/ui` from the CI job `x86_64-gnu-parallel-frontend`, please +If you see any test failures in `tests/ui` from the CI job `test-x86_64-gnu-parallel-frontend`, please add `//@ ignore-parallel-frontend triage` to the failing test, even if your PR is otherwise entirely unrelated to parallel compiler or its testing. In some time people from the parallel rustc working group will triage the failing test, make a diff --git a/src/tests/stdlib-semver-check.md b/src/tests/stdlib-semver-check.md index af1116f69e..8e6f447cd6 100644 --- a/src/tests/stdlib-semver-check.md +++ b/src/tests/stdlib-semver-check.md @@ -1,6 +1,6 @@ # Standard library semantic versioning breakage check -The `x86_64-gnu-stdlib-semver-check` job runs the [`cargo-semver-checks`][csc] (c-s-c) tool on the standard library (`core`, `alloc` and `std`) in order to find potential unintended semantic versioning (semver) breakages. +The `test-x86_64-gnu-stdlib-semver-check` job runs the [`cargo-semver-checks`][csc] (c-s-c) tool on the standard library (`core`, `alloc` and `std`) in order to find potential unintended semantic versioning (semver) breakages. It does so by analyzing the rustdoc JSON output (from the `rust-docs-json` component) of the parent merge commit, and the current commit being merged. When it runs, one of five things can happen: diff --git a/src/tests/x86_64-gnu-next-trait-solver-polonius-ci-job.md b/src/tests/x86_64-gnu-next-trait-solver-polonius-ci-job.md index fd35346f52..08206d2c35 100644 --- a/src/tests/x86_64-gnu-next-trait-solver-polonius-ci-job.md +++ b/src/tests/x86_64-gnu-next-trait-solver-polonius-ci-job.md @@ -5,7 +5,7 @@ alpha with a goal to stabilize them in 2026. To achieve this, we need to ensure these unstable features are well tested and continuously well tested so they do not regress. -This calls for a dedicated CI job [`x86_64-gnu-next-trait-solver-polonius`] which is +This calls for a dedicated CI job [`test-x86_64-gnu-next-trait-solver-polonius`] which is blocking in PR CI and thus also Merge CI to catch regressions. For more context, see: @@ -51,4 +51,4 @@ a new topic in [t-compiler zulip channel](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler). -[`x86_64-gnu-next-trait-solver-polonius`]: https://github.com/rust-lang/rust/pull/157322 +[`test-x86_64-gnu-next-trait-solver-polonius`]: https://github.com/rust-lang/rust/pull/157322