Skip to content

Commit dd549be

Browse files
committed
Test the c-system feature in CI as well
1 parent 4b12863 commit dd549be

File tree

6 files changed

+30
-9
lines changed

6 files changed

+30
-9
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
FROM ubuntu:18.04
2-
RUN apt-get update && \
2+
RUN dpkg --add-architecture arm64 && \
3+
apt-get update && \
34
apt-get install -y --no-install-recommends \
45
gcc libc6-dev ca-certificates \
56
gcc-aarch64-linux-gnu libc6-dev-arm64-cross \
7+
clang libclang-common-6.0-dev:arm64 \
68
qemu-user-static
79
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
810
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER=qemu-aarch64-static \
911
QEMU_LD_PREFIX=/usr/aarch64-linux-gnu \
12+
CLANG=clang \
1013
RUST_TEST_THREADS=1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
FROM ubuntu:18.04
2-
RUN apt-get update && \
2+
RUN dpkg --add-architecture armhf && \
3+
apt-get update && \
34
apt-get install -y --no-install-recommends \
45
gcc libc6-dev ca-certificates \
5-
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user-static
6+
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross \
7+
clang libclang-common-6.0-dev:armhf \
8+
qemu-user-static
69
ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
710
CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER=qemu-arm-static \
811
QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf \
12+
CLANG=clang \
913
RUST_TEST_THREADS=1
+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
FROM ubuntu:18.04
2-
RUN apt-get update && \
2+
RUN dpkg --add-architecture i386 && \
3+
apt-get update && \
34
apt-get install -y --no-install-recommends \
4-
gcc-multilib libc6-dev ca-certificates
5+
gcc-multilib libc6-dev ca-certificates \
6+
clang libclang-common-6.0-dev:i386
7+
ENV CLANG=clang
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
FROM ubuntu:18.04
22

3-
RUN apt-get update && \
3+
RUN dpkg --add-architecture ppc64el && \
4+
apt-get update && \
45
apt-get install -y --no-install-recommends \
5-
gcc libc6-dev qemu-user-static ca-certificates \
6+
gcc libc6-dev ca-certificates \
67
gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross \
7-
qemu-system-ppc
8+
clang libclang-common-6.0-dev:ppc64el \
9+
qemu-user-static qemu-system-ppc
810

911
ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc \
1012
CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_RUNNER=qemu-ppc64le-static \
1113
QEMU_CPU=POWER8 \
1214
QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu \
15+
CLANG=clang \
1316
RUST_TEST_THREADS=1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM ubuntu:18.04
22
RUN apt-get update && \
33
apt-get install -y --no-install-recommends \
4-
gcc libc6-dev ca-certificates
4+
gcc libc6-dev ca-certificates clang

ci/run.sh

+8
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ cargo build --target $1
1818
cargo build --target $1 --release
1919
cargo build --target $1 --features c
2020
cargo build --target $1 --release --features c
21+
if [ -n "$CLANG" -o -n "$LLVM_CONFIG" ]; then
22+
cargo build --target $1 --features c-system
23+
cargo build --target $1 --release --features c-system
24+
fi
2125

2226
PREFIX=$(echo $1 | sed -e 's/unknown-//')-
2327
case $1 in
@@ -77,6 +81,10 @@ RUSTFLAGS="-C debug-assertions=no" $build_intrinsics
7781
RUSTFLAGS="-C debug-assertions=no" $build_intrinsics --release
7882
RUSTFLAGS="-C debug-assertions=no" $build_intrinsics --features c
7983
RUSTFLAGS="-C debug-assertions=no" $build_intrinsics --features c --release
84+
if [ -n "$CLANG" -o -n "$LLVM_CONFIG" ]; then
85+
RUSTFLAGS="-C debug-assertions=no" $build_intrinsics --features c-system
86+
RUSTFLAGS="-C debug-assertions=no" $build_intrinsics --features c-system --release
87+
fi
8088

8189
# Verify that there are no undefined symbols to `panic` within our
8290
# implementations

0 commit comments

Comments
 (0)