Skip to content

Commit a141b69

Browse files
Rename SKIP_CODEGEN_TESTS into ENABLE_GCC_CODEGEN
1 parent 25a96ca commit a141b69

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
env: {}
5959
- name: x86_64-gnu-llvm-15
6060
env:
61-
SKIP_CODEGEN_TESTS: "1"
61+
ENABLE_GCC_CODEGEN: "1"
6262
os: ubuntu-20.04-16core-64gb
6363
- name: x86_64-gnu-tools
6464
os: ubuntu-20.04-16core-64gb

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +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-
if [[ "${SKIP_CODEGEN_TESTS}" == "1" ]]; then
7+
if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then
88
../x.py --stage 1 test --skip src/tools/tidy --skip tests/codegen
99
else
1010
../x.py --stage 1 test --skip src/tools/tidy
@@ -24,7 +24,7 @@ if [[ -z "${PR_CI_JOB}" ]]; then
2424
fi
2525

2626
# NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux.
27-
if [[ "${SKIP_CODEGEN_TESTS}" == "1" ]]; then
27+
if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then
2828
../x.py --stage 2 test --skip src/tools/tidy --skip tests/codegen
2929
else
3030
../x.py --stage 2 test --skip src/tools/tidy

src/ci/docker/run.sh

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

src/ci/github-actions/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ jobs:
333333
- name: x86_64-gnu-llvm-15
334334
<<: *job-linux-16c
335335
env:
336-
SKIP_CODEGEN_TESTS: "1"
336+
ENABLE_GCC_CODEGEN: "1"
337337

338338
- name: x86_64-gnu-tools
339339
<<: *job-linux-16c

src/ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ else
126126

127127
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir"
128128

129-
if [[ "${SKIP_CODEGEN_TESTS}" == "1" ]]; then
129+
if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then
130130
# Test the Cranelift backend in CI. Bootstrap knows which targets to run tests on.
131131
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift"
132132
else

0 commit comments

Comments
 (0)