languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-11-02 11:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Run codegen tests outside if not llvm-15

Browse source
This commit is contained in:
Guillaume Gomez 2023-11-01 15:48:12 +01:00
parent 260d91bd41
commit 13f7f052d8
4 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View file

@ -57,8 +57,9 @@ jobs:
os: ubuntu-20.04-4core-16gb os: ubuntu-20.04-4core-16gb
env: {} env: {}
- name: x86_64-gnu-llvm-15 - name: x86_64-gnu-llvm-15
env:
SKIP_CODEGEN_TESTS: "1"
os: ubuntu-20.04-16core-64gb os: ubuntu-20.04-16core-64gb
env: {}
- name: x86_64-gnu-tools - name: x86_64-gnu-tools
os: ubuntu-20.04-16core-64gb os: ubuntu-20.04-16core-64gb
env: {} env: {}

8
src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/script.sh
View file

@ -4,7 +4,11 @@ set -ex
# Only run the stage 1 tests on merges, not on PR CI jobs. # Only run the stage 1 tests on merges, not on PR CI jobs.
if [[ -z "${PR_CI_JOB}" ]]; then if [[ -z "${PR_CI_JOB}" ]]; then
if [[ "${SKIP_CODEGEN_TESTS}" == "1" ]]; then
../x.py --stage 1 test --skip src/tools/tidy --skip tests/codegen ../x.py --stage 1 test --skip src/tools/tidy --skip tests/codegen
else
../x.py --stage 1 test --skip src/tools/tidy
fi
# Run the `mir-opt` tests again but this time for a 32-bit target. # Run the `mir-opt` tests again but this time for a 32-bit target.
# This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have # This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have
@ -20,7 +24,11 @@ if [[ -z "${PR_CI_JOB}" ]]; then
fi fi
# NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux. # NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux.
if [[ "${SKIP_CODEGEN_TESTS}" == "1" ]]; then
../x.py --stage 2 test --skip src/tools/tidy --skip tests/codegen ../x.py --stage 2 test --skip src/tools/tidy --skip tests/codegen
else
../x.py --stage 2 test --skip src/tools/tidy
fi
# Run the `mir-opt` tests again but this time for a 32-bit target. # Run the `mir-opt` tests again but this time for a 32-bit target.
# This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have # This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have

1
src/ci/docker/run.sh
View file

@ -271,6 +271,7 @@ docker \
run \ run \
--workdir /checkout/obj \ --workdir /checkout/obj \
--env SRC=/checkout \ --env SRC=/checkout \
--env "SKIP_CODEGEN_TESTS=$SKIP_CODEGEN_TESTS" \
$args \ $args \
--env CARGO_HOME=/cargo \ --env CARGO_HOME=/cargo \
--env DEPLOY \ --env DEPLOY \

2
src/ci/github-actions/ci.yml
View file

@ -332,6 +332,8 @@ jobs:
- name: x86_64-gnu-llvm-15 - name: x86_64-gnu-llvm-15
<<: *job-linux-16c <<: *job-linux-16c
env:
SKIP_CODEGEN_TESTS: "1"
- name: x86_64-gnu-tools - name: x86_64-gnu-tools
<<: *job-linux-16c <<: *job-linux-16c