Skip to content

Commit 4d781f6

Browse files
Run codegen tests outside if not llvm-15
1 parent 9b7702f commit 4d781f6

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

.github/workflows/ci.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ jobs:
5757
os: ubuntu-20.04-4core-16gb
5858
env: {}
5959
- name: x86_64-gnu-llvm-15
60+
env:
61+
SKIP_CODEGEN_TESTS: "1"
6062
os: ubuntu-20.04-16core-64gb
61-
env: {}
6263
- name: x86_64-gnu-tools
6364
os: ubuntu-20.04-16core-64gb
6465
env: {}

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

+10-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ set -ex
44

55
# Only run the stage 1 tests on merges, not on PR CI jobs.
66
if [[ -z "${PR_CI_JOB}" ]]; then
7-
../x.py --stage 1 test --skip src/tools/tidy --skip tests/codegen
7+
if [[ "${SKIP_CODEGEN_TESTS}" == "1" ]]; then
8+
../x.py --stage 1 test --skip src/tools/tidy --skip tests/codegen
9+
else
10+
../x.py --stage 1 test --skip src/tools/tidy
11+
fi
812

913
# Run the `mir-opt` tests again but this time for a 32-bit target.
1014
# This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have
@@ -20,7 +24,11 @@ if [[ -z "${PR_CI_JOB}" ]]; then
2024
fi
2125

2226
# NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux.
23-
../x.py --stage 2 test --skip src/tools/tidy --skip tests/codegen
27+
if [[ "${SKIP_CODEGEN_TESTS}" == "1" ]]; then
28+
../x.py --stage 2 test --skip src/tools/tidy --skip tests/codegen
29+
else
30+
../x.py --stage 2 test --skip src/tools/tidy
31+
fi
2432

2533
# Run the `mir-opt` tests again but this time for a 32-bit target.
2634
# This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have

src/ci/docker/run.sh

+1
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ docker \
271271
run \
272272
--workdir /checkout/obj \
273273
--env SRC=/checkout \
274+
--env "SKIP_CODEGEN_TESTS=$SKIP_CODEGEN_TESTS" \
274275
$args \
275276
--env CARGO_HOME=/cargo \
276277
--env DEPLOY \

src/ci/github-actions/ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,8 @@ jobs:
332332

333333
- name: x86_64-gnu-llvm-15
334334
<<: *job-linux-16c
335+
env:
336+
SKIP_CODEGEN_TESTS: "1"
335337

336338
- name: x86_64-gnu-tools
337339
<<: *job-linux-16c

0 commit comments

Comments
 (0)