Skip to content

Commit 6c4755d

Browse files
committed
Auto merge of #126173 - nikic:pr-ci-codegen-tests, r=Kobzol
Don't disable codegen tests in PR CI Fixes #126170. r? `@ghost`
2 parents f21554f + 9cd6c32 commit 6c4755d

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

Diff for: src/ci/docker/scripts/x86_64-gnu-llvm.sh

+2-14
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@ 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-
# When running gcc backend tests, we need to install `libgccjit` and to not run llvm codegen
8-
# tests as it will fail them.
9-
if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then
10-
../x.py --stage 1 test --skip src/tools/tidy --skip tests/codegen
11-
else
12-
../x.py --stage 1 test --skip src/tools/tidy
13-
fi
7+
../x.py --stage 1 test --skip src/tools/tidy
148

159
# Run the `mir-opt` tests again but this time for a 32-bit target.
1610
# This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have
@@ -29,14 +23,8 @@ if [[ -z "${PR_CI_JOB}" ]]; then
2923
--rustc-args "--cfg feature=\"optimize_for_size\""
3024
fi
3125

32-
# When running gcc backend tests, we need to install `libgccjit` and to not run llvm codegen
33-
# tests as it will fail them.
3426
# NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux.
35-
if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then
36-
../x.py --stage 2 test --skip src/tools/tidy --skip tests/codegen
37-
else
38-
../x.py --stage 2 test --skip src/tools/tidy
39-
fi
27+
../x.py --stage 2 test --skip src/tools/tidy
4028

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

0 commit comments

Comments
 (0)