Skip to content

Commit e2d0466

Browse files
Run rust tests with GCC backend
1 parent be8de5d commit e2d0466

File tree

3 files changed

+46
-1
lines changed

3 files changed

+46
-1
lines changed
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
FROM ubuntu:22.04
2+
3+
ARG DEBIAN_FRONTEND=noninteractive
4+
RUN apt-get update && apt-get install -y --no-install-recommends \
5+
g++ \
6+
make \
7+
ninja-build \
8+
file \
9+
curl \
10+
ca-certificates \
11+
python3 \
12+
git \
13+
cmake \
14+
sudo \
15+
gdb \
16+
libssl-dev \
17+
pkg-config \
18+
xz-utils \
19+
mingw-w64 \
20+
zlib1g-dev \
21+
libzstd-dev \
22+
# libgccjit dependencies
23+
flex \
24+
libmpfr-dev \
25+
libgmp-dev \
26+
libmpc3 \
27+
libmpc-dev \
28+
&& rm -rf /var/lib/apt/lists/*
29+
30+
COPY scripts/sccache.sh /scripts/
31+
RUN sh /scripts/sccache.sh
32+
33+
ENV RUST_CONFIGURE_ARGS \
34+
--build=x86_64-unknown-linux-gnu \
35+
--enable-sanitizers \
36+
--enable-profiler \
37+
--enable-compiler-docs \
38+
--set llvm.libzstd=true \
39+
--set rust.codegen-backends=llvm,gcc
40+
ENV SCRIPT python3 ../x.py --stage 2 test --test-codegen-backend gcc

src/ci/github-actions/jobs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,9 @@ auto:
348348
- name: x86_64-gnu
349349
<<: *job-linux-4c
350350

351+
- name: x86_64-gnu-gcc
352+
<<: *job-linux-4c
353+
351354
# This job ensures commits landing on nightly still pass the full
352355
# test suite on the stable channel. There are some UI tests that
353356
# depend on the channel being built (for example if they include the

src/ci/run.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,9 @@ else
188188
fi
189189

190190
# Download GCC from CI on test builders
191-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set gcc.download-ci-gcc=true"
191+
# FIXME: Temporarily commented out until the GCC build/download strategy is cleared out or
192+
# made dependent on GCC submodule changes.
193+
# RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set gcc.download-ci-gcc=true"
192194

193195
# download-rustc seems to be broken on CI after the stage0 redesign
194196
# Disable it until these issues are debugged and resolved

0 commit comments

Comments
 (0)