This repository was archived by the owner on May 28, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +34
-9
lines changed Expand file tree Collapse file tree 4 files changed +34
-9
lines changed Original file line number Diff line number Diff line change @@ -60,4 +60,5 @@ COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
6060RUN /scripts/build-gccjit.sh /scripts
6161
6262COPY scripts/x86_64-gnu-llvm.sh /tmp/script.sh
63- ENV SCRIPT /tmp/script.sh
63+ ARG SCRIPT_ARG
64+ ENV SCRIPT="/tmp/script.sh && ${SCRIPT_ARG}"
Original file line number Diff line number Diff line change @@ -60,4 +60,5 @@ COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
6060RUN /scripts/build-gccjit.sh /scripts
6161
6262COPY scripts/x86_64-gnu-llvm.sh /tmp/script.sh
63- ENV SCRIPT /tmp/script.sh
63+ ARG SCRIPT_ARG
64+ ENV SCRIPT="/tmp/script.sh && ${SCRIPT_ARG}"
Original file line number Diff line number Diff line change @@ -39,9 +39,6 @@ if [[ -z "${PR_CI_JOB}" ]]; then
3939 library/std library/alloc library/core
4040fi
4141
42- # NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux.
43- ../x.py --stage 2 test --skip src/tools/tidy
44-
4542# Run the `mir-opt` tests again but this time for a 32-bit target.
4643# This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have
4744# both 32-bit and 64-bit outputs updated by the PR author, before
Original file line number Diff line number Diff line change 117117 ENABLE_GCC_CODEGEN : " 1"
118118 # We are adding (temporarily) a dummy commit on the compiler
119119 READ_ONLY_SRC : " 0"
120+ DOCKER_SCRIPT : python3 ../x.py --stage 2 test --skip src/tools/tidy
120121 << : *job-linux-16c
121122 - image : x86_64-gnu-tools
122123 << : *job-linux-16c
@@ -312,16 +313,41 @@ auto:
312313 - image : x86_64-gnu-distcheck
313314 << : *job-linux-8c
314315
315- - image : x86_64-gnu-llvm-19
316+ # The x86_64-gnu-llvm-19 job is split into multiple jobs to run tests in parallel.
317+ # x86_64-gnu-llvm-19-1 skips tests that run in x86_64-gnu-llvm-19-2.
318+ - image : x86_64-gnu-llvm-19-1
316319 env :
317320 RUST_BACKTRACE : 1
318- << : *job-linux-8c
321+ IMAGE : x86_64-gnu-llvm-19
322+ << : *stage_2_test_set1
323+ << : *job-linux-4c
319324
320- - image : x86_64-gnu-llvm-18
325+ # Skip tests that run in x86_64-gnu-llvm-19-2
326+ - image : x86_64-gnu-llvm-19-2
327+ env :
328+ RUST_BACKTRACE : 1
329+ IMAGE : x86_64-gnu-llvm-19
330+ << : *stage_2_test_set2
331+ << : *job-linux-4c
332+
333+ # The x86_64-gnu-llvm-18 job is split into multiple jobs to run tests in parallel.
334+ # x86_64-gnu-llvm-18-1 skips tests that run in x86_64-gnu-llvm-18-2.
335+ - image : x86_64-gnu-llvm-18-1
321336 env :
322337 RUST_BACKTRACE : 1
323338 READ_ONLY_SRC : " 0"
324- << : *job-linux-8c
339+ IMAGE : x86_64-gnu-llvm-18
340+ << : *stage_2_test_set1
341+ << : *job-linux-4c
342+
343+ # Skip tests that run in x86_64-gnu-llvm-18-2
344+ - image : x86_64-gnu-llvm-18-2
345+ env :
346+ RUST_BACKTRACE : 1
347+ READ_ONLY_SRC : " 0"
348+ IMAGE : x86_64-gnu-llvm-18
349+ << : *stage_2_test_set2
350+ << : *job-linux-4c
325351
326352 - image : x86_64-gnu-nopt
327353 << : *job-linux-4c
You can’t perform that action at this time.
0 commit comments