mirror of
https://github.com/rust-lang/rust
synced 2024-09-05 08:37:14 +00:00
Rename SKIP_CODEGEN_TESTS
into ENABLE_GCC_CODEGEN
This commit is contained in:
parent
25a96ca0e5
commit
a141b6975b
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -58,7 +58,7 @@ jobs:
|
||||||
env: {}
|
env: {}
|
||||||
- name: x86_64-gnu-llvm-15
|
- name: x86_64-gnu-llvm-15
|
||||||
env:
|
env:
|
||||||
SKIP_CODEGEN_TESTS: "1"
|
ENABLE_GCC_CODEGEN: "1"
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-16core-64gb
|
||||||
- name: x86_64-gnu-tools
|
- name: x86_64-gnu-tools
|
||||||
os: ubuntu-20.04-16core-64gb
|
os: ubuntu-20.04-16core-64gb
|
||||||
|
|
|
@ -4,7 +4,7 @@ set -ex
|
||||||
|
|
||||||
# Only run the stage 1 tests on merges, not on PR CI jobs.
|
# Only run the stage 1 tests on merges, not on PR CI jobs.
|
||||||
if [[ -z "${PR_CI_JOB}" ]]; then
|
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
|
../x.py --stage 1 test --skip src/tools/tidy --skip tests/codegen
|
||||||
else
|
else
|
||||||
../x.py --stage 1 test --skip src/tools/tidy
|
../x.py --stage 1 test --skip src/tools/tidy
|
||||||
|
@ -24,7 +24,7 @@ if [[ -z "${PR_CI_JOB}" ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux.
|
# 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
|
../x.py --stage 2 test --skip src/tools/tidy --skip tests/codegen
|
||||||
else
|
else
|
||||||
../x.py --stage 2 test --skip src/tools/tidy
|
../x.py --stage 2 test --skip src/tools/tidy
|
||||||
|
|
|
@ -271,7 +271,7 @@ docker \
|
||||||
run \
|
run \
|
||||||
--workdir /checkout/obj \
|
--workdir /checkout/obj \
|
||||||
--env SRC=/checkout \
|
--env SRC=/checkout \
|
||||||
--env "SKIP_CODEGEN_TESTS=$SKIP_CODEGEN_TESTS" \
|
--env "ENABLE_GCC_CODEGEN=$ENABLE_GCC_CODEGEN" \
|
||||||
$args \
|
$args \
|
||||||
--env CARGO_HOME=/cargo \
|
--env CARGO_HOME=/cargo \
|
||||||
--env DEPLOY \
|
--env DEPLOY \
|
||||||
|
|
|
@ -333,7 +333,7 @@ jobs:
|
||||||
- name: x86_64-gnu-llvm-15
|
- name: x86_64-gnu-llvm-15
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-16c
|
||||||
env:
|
env:
|
||||||
SKIP_CODEGEN_TESTS: "1"
|
ENABLE_GCC_CODEGEN: "1"
|
||||||
|
|
||||||
- name: x86_64-gnu-tools
|
- name: x86_64-gnu-tools
|
||||||
<<: *job-linux-16c
|
<<: *job-linux-16c
|
||||||
|
|
|
@ -126,7 +126,7 @@ else
|
||||||
|
|
||||||
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir"
|
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.
|
# 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"
|
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift"
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue