Rename SKIP_CODEGEN_TESTS into ENABLE_GCC_CODEGEN

jyn514 · Nov 2, 2023 · a141b69 · a141b69
1 parent 25a96ca
commit a141b69
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,7 +58,7 @@ jobs:
             env: {}
           - name: x86_64-gnu-llvm-15
             env:
-              SKIP_CODEGEN_TESTS: "1"
+              ENABLE_GCC_CODEGEN: "1"
             os: ubuntu-20.04-16core-64gb
           - name: x86_64-gnu-tools
             os: ubuntu-20.04-16core-64gb

diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/script.sh b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/script.sh
@@ -4,7 +4,7 @@ set -ex
 
 # Only run the stage 1 tests on merges, not on PR CI jobs.
 if [[ -z "${PR_CI_JOB}" ]]; then
-    if [[ "${SKIP_CODEGEN_TESTS}" == "1" ]]; then
+    if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then
         ../x.py --stage 1 test --skip src/tools/tidy --skip tests/codegen
     else
         ../x.py --stage 1 test --skip src/tools/tidy
@@ -24,7 +24,7 @@ if [[ -z "${PR_CI_JOB}" ]]; then
 fi
 
 # 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
+if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then
     ../x.py --stage 2 test --skip src/tools/tidy --skip tests/codegen
 else
     ../x.py --stage 2 test --skip src/tools/tidy

diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
@@ -271,7 +271,7 @@ docker \
   run \
   --workdir /checkout/obj \
   --env SRC=/checkout \
-  --env "SKIP_CODEGEN_TESTS=$SKIP_CODEGEN_TESTS" \
+  --env "ENABLE_GCC_CODEGEN=$ENABLE_GCC_CODEGEN" \
   $args \
   --env CARGO_HOME=/cargo \
   --env DEPLOY \

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
@@ -333,7 +333,7 @@ jobs:
           - name: x86_64-gnu-llvm-15
             <<: *job-linux-16c
             env:
-              SKIP_CODEGEN_TESTS: "1"
+              ENABLE_GCC_CODEGEN: "1"
 
           - name: x86_64-gnu-tools
             <<: *job-linux-16c

diff --git a/src/ci/run.sh b/src/ci/run.sh
@@ -126,7 +126,7 @@ else
 
   RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir"
 
-  if [[ "${SKIP_CODEGEN_TESTS}" == "1" ]]; then
+  if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then
     # Test the Cranelift backend in CI. Bootstrap knows which targets to run tests on.
     RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift"
   else