diff options
| author | bors <bors@rust-lang.org> | 2025-07-22 18:39:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-22 18:39:58 +0000 |
| commit | a7a1618e6c835f1f00940ad72203d05808209a0d (patch) | |
| tree | efca82e10564eec78574d5f91b339a786040552b /src/ci/docker | |
| parent | 2e5367566819ca7878baa9600ae7a93eb0e37bbf (diff) | |
| parent | 6bfa00816d7e4dcb0aee9fe547bc75dfe59dc613 (diff) | |
| download | rust-a7a1618e6c835f1f00940ad72203d05808209a0d.tar.gz rust-a7a1618e6c835f1f00940ad72203d05808209a0d.zip | |
Auto merge of #144249 - GuillaumeGomez:asm-tests, r=jieyouxu
Rename `tests/{assembly,codegen}` into `tests/{assembly,codegen}-llvm` and ignore these testsuites if configured backend doesn't match
Follow-up of https://github.com/rust-lang/rust/pull/144125.
This PR changes `compiletest` so that `asm` tests are only run if they match the current codegen backend. To better reflect it, I renamed the `tests/ui/asm` folder into `tests/ui/asm-llvm`. Like that, we can add new asm tests for other backends if we want without needing to add extra code to `compiletest`.
Next step will be to use the new code annotations added in rust-lang/rust#144125 to ignore ui tests failing in cg_gcc until it's fixed on our side.
cc `@antoyo` `@oli-obk`
r? `@Kobzol`
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/host-x86_64/test-various/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ci/docker/host-x86_64/test-various/Dockerfile b/src/ci/docker/host-x86_64/test-various/Dockerfile index 8d2e45ae497..4d09bea69c0 100644 --- a/src/ci/docker/host-x86_64/test-various/Dockerfile +++ b/src/ci/docker/host-x86_64/test-various/Dockerfile @@ -65,14 +65,14 @@ ENV WASM_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $WASM_T tests/ui \ tests/mir-opt \ tests/codegen-units \ - tests/codegen \ - tests/assembly \ + tests/codegen-llvm \ + tests/assembly-llvm \ library/core ENV NVPTX_TARGETS=nvptx64-nvidia-cuda ENV NVPTX_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $NVPTX_TARGETS \ tests/run-make \ - tests/assembly + tests/assembly-llvm ENV MUSL_TARGETS=x86_64-unknown-linux-musl \ CC_x86_64_unknown_linux_musl=x86_64-linux-musl-gcc \ |