Skip to content

Commit 662871f

Browse files
ecstatic-morseMark-Simulacrum
authored andcommitted
Add no-opt standard library builders
We already have builders which built standard library *test*s without optimizations, but we previously did not have builders which built the standard library itself without optimizations and then tested that. This adds those builds for i686 and x86_64 linux.
1 parent 1275cc1 commit 662871f

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

Diff for: src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile

+6-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1919
COPY scripts/sccache.sh /scripts/
2020
RUN sh /scripts/sccache.sh
2121

22+
RUN mkdir -p /config
23+
RUN echo "[rust]" > /config/nopt-std-config.toml
24+
RUN echo "optimize = false" >> /config/nopt-std-config.toml
25+
2226
ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests
23-
ENV SCRIPT python3 ../x.py --stage 2 test
27+
ENV SCRIPT python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std \
28+
&& python3 ../x.py --stage 2 test
2429

2530
# FIXME(#59637) takes too long on CI right now
2631
ENV NO_LLVM_ASSERTIONS=1 NO_DEBUG_ASSERTIONS=1

Diff for: src/ci/docker/host-x86_64/x86_64-gnu-nopt/Dockerfile

+6-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1818
COPY scripts/sccache.sh /scripts/
1919
RUN sh /scripts/sccache.sh
2020

21+
RUN mkdir -p /config
22+
RUN echo "[rust]" > /config/nopt-std-config.toml
23+
RUN echo "optimize = false" >> /config/nopt-std-config.toml
24+
2125
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu \
2226
--disable-optimize-tests \
2327
--set rust.test-compare-mode
24-
ENV SCRIPT python3 ../x.py --stage 2 test
28+
ENV SCRIPT python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std \
29+
&& python3 ../x.py --stage 2 test

0 commit comments

Comments
 (0)