diff options
Diffstat (limited to 'src/ci/docker')
| -rwxr-xr-x | src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/script.sh | 12 | ||||
| -rwxr-xr-x | src/ci/docker/run.sh | 1 |
2 files changed, 11 insertions, 2 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 72a3cbf0596..8999983e428 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,11 @@ set -ex # Only run the stage 1 tests on merges, not on PR CI jobs. if [[ -z "${PR_CI_JOB}" ]]; then - ../x.py --stage 1 test --skip src/tools/tidy --skip tests/codegen + if [[ "${SKIP_CODEGEN_TESTS}" == "1" ]]; then + ../x.py --stage 1 test --skip src/tools/tidy --skip tests/codegen + else + ../x.py --stage 1 test --skip src/tools/tidy + fi # Run the `mir-opt` tests again but this time for a 32-bit target. # This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have @@ -20,7 +24,11 @@ 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. -../x.py --stage 2 test --skip src/tools/tidy --skip tests/codegen +if [[ "${SKIP_CODEGEN_TESTS}" == "1" ]]; then + ../x.py --stage 2 test --skip src/tools/tidy --skip tests/codegen +else + ../x.py --stage 2 test --skip src/tools/tidy +fi # Run the `mir-opt` tests again but this time for a 32-bit target. # This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index 0b535532f69..5e85bd14ea3 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -271,6 +271,7 @@ docker \ run \ --workdir /checkout/obj \ --env SRC=/checkout \ + --env "SKIP_CODEGEN_TESTS=$SKIP_CODEGEN_TESTS" \ $args \ --env CARGO_HOME=/cargo \ --env DEPLOY \ |