mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename SKIP_CODEGEN_TESTS into ENABLE_GCC_CODEGEN

Browse Source
This commit is contained in:
Guillaume Gomez 2023-11-02 13:54:14 +01:00
parent 25a96ca0e5
commit a141b6975b
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -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
src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/script.sh
View File

@ -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

2
src/ci/docker/run.sh
View File

@ -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 \

2
src/ci/github-actions/ci.yml
View File

@ -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

2
src/ci/run.sh
View File

@ -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