diff options
| author | Guillaume Gomez <guillaume.gomez@huawei.com> | 2023-11-02 13:54:14 +0100 |
|---|---|---|
| committer | Guillaume Gomez <guillaume.gomez@huawei.com> | 2023-11-02 21:03:27 +0100 |
| commit | a141b6975b44f9cd3bc2bbc752885ffe630e4bce (patch) | |
| tree | 84a424606a064a2d3fa8fa7d71310b6351324582 /src/ci | |
| parent | 25a96ca0e5dc680362ebf6cb83dbab1024a527ae (diff) | |
| download | rust-a141b6975b44f9cd3bc2bbc752885ffe630e4bce.tar.gz rust-a141b6975b44f9cd3bc2bbc752885ffe630e4bce.zip | |
Rename `SKIP_CODEGEN_TESTS` into `ENABLE_GCC_CODEGEN`
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/script.sh | 4 | ||||
| -rwxr-xr-x | src/ci/docker/run.sh | 2 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 2 | ||||
| -rwxr-xr-x | src/ci/run.sh | 2 |
4 files changed, 5 insertions, 5 deletions
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 index 8999983e428..b964f19fe0b 100755 --- 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 index 5e85bd14ea3..5021ed44658 100755 --- 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 index f5f02ba3216..c90cd873c9e 100644 --- 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 index 2437b7f348e..fbdd821dd3e 100755 --- 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 |