Skip to content

Commit 180ad53

Browse files
authored
Rollup merge of rust-lang#52465 - sekineh:add-ci-thumb, r=alexcrichton
Add CI test harness for `thumb*` targets. [IRR-2018-embedded] This pull request will do the following (rather trivial) changes: - Fix rust-lang#52163. In other words, we enabled `./x.py test src/test/run-make` for `no_std` targets. - Modify `dist-various-1` Dockerfile. - CI now performs `run-make` test run on the targets below: - `thumbv6m-none-eabi` - `thumbv7m-none-eabi` - `thumbv7em-none-eabi` - `thumbv7em-none-eabihf`. - ~~Add `thumb-none` Dockerfile.~~ - ~~Initially, `thumbv7m-none-eabi`, `thumbv7em-none-eabi` and `thumbv7em-none-eabihf` are included as the tested target. `thumbv6m-none-eabi` is disabled for now because LLVM support is not certain.~~ - ~~Add `thumb-none` to .travis.yml~~ Note: - `run-make` tests are not implemented yet. This PR is test harness only. The amount of change is very small, but I'd like to open the pull request while the change is trivial. Because I'm not very used to pull request process, I want to make a small progress first. This PR will be a foundation for later additions. CC @kennytm @jamesmunns @nerdyvaishali
2 parents 67cf3ba + 3f00b1c commit 180ad53

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/bootstrap/test.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,9 @@ impl Step for Compiletest {
966966
builder.ensure(compile::Rustc { compiler, target });
967967
}
968968

969-
builder.ensure(compile::Test { compiler, target });
969+
if builder.no_std(target) != Some(true) {
970+
builder.ensure(compile::Test { compiler, target });
971+
}
970972
builder.ensure(native::TestHelpers { target });
971973
builder.ensure(RemoteCopyLibs { compiler, target });
972974

src/ci/docker/dist-various-1/Dockerfile

+8-1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ RUN \
8080
echo "# a" >> /usr/local/mips-linux-musl/bin/mips-openwrt-linux-musl-wrapper.sh && \
8181
echo "# b" >> /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-musl-wrapper.sh
8282

83+
ENV RUN_MAKE_TARGETS=thumbv6m-none-eabi
84+
ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7m-none-eabi
85+
ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7em-none-eabi
86+
ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7em-none-eabihf
87+
8388
ENV TARGETS=asmjs-unknown-emscripten
8489
ENV TARGETS=$TARGETS,wasm32-unknown-emscripten
8590
ENV TARGETS=$TARGETS,x86_64-rumprun-netbsd
@@ -120,7 +125,9 @@ ENV RUST_CONFIGURE_ARGS \
120125
--enable-emscripten \
121126
--disable-docs
122127

123-
ENV SCRIPT python2.7 ../x.py dist --target $TARGETS
128+
ENV SCRIPT \
129+
python2.7 ../x.py test --target $RUN_MAKE_TARGETS src/test/run-make && \
130+
python2.7 ../x.py dist --target $TARGETS
124131

125132
# sccache
126133
COPY scripts/sccache.sh /scripts/

0 commit comments

Comments
 (0)