about summary refs log tree commit diff
path: root/src/ci/docker/scripts
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2024-06-08 21:25:49 +0200
committerNikita Popov <nikita.ppv@gmail.com>2024-06-08 21:25:49 +0200
commit9cd6c3244577b21b60d30711aa976333ef05bea0 (patch)
tree631634b208cfa1b22e057adb40fb6ed0f094f9c6 /src/ci/docker/scripts
parentcfdb6175c2286acdd0c7d71a2ac9eefb777eec09 (diff)
downloadrust-9cd6c3244577b21b60d30711aa976333ef05bea0.tar.gz
rust-9cd6c3244577b21b60d30711aa976333ef05bea0.zip
Don't disable codegen tests in PR CI
Diffstat (limited to 'src/ci/docker/scripts')
-rwxr-xr-xsrc/ci/docker/scripts/x86_64-gnu-llvm.sh16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/ci/docker/scripts/x86_64-gnu-llvm.sh b/src/ci/docker/scripts/x86_64-gnu-llvm.sh
index 876b300d35c..b3921f11421 100755
--- a/src/ci/docker/scripts/x86_64-gnu-llvm.sh
+++ b/src/ci/docker/scripts/x86_64-gnu-llvm.sh
@@ -4,13 +4,7 @@ set -ex
 
 # Only run the stage 1 tests on merges, not on PR CI jobs.
 if [[ -z "${PR_CI_JOB}" ]]; then
-    # When running gcc backend tests, we need to install `libgccjit` and to not run llvm codegen
-    # tests as it will fail them.
-    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
-    fi
+    ../x.py --stage 1 test --skip src/tools/tidy
 
     # 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
@@ -29,14 +23,8 @@ if [[ -z "${PR_CI_JOB}" ]]; then
         --rustc-args "--cfg feature=\"optimize_for_size\""
 fi
 
-# When running gcc backend tests, we need to install `libgccjit` and to not run llvm codegen
-# tests as it will fail them.
 # NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux.
-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
-fi
+../x.py --stage 2 test --skip src/tools/tidy
 
 # 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