Skip to content

Commit 722f5c9

Browse files
gnzlbggnzlbg
committed
test that including stdsimd as a submodule in libstd succeeds
1 parent fed2a62 commit 722f5c9

File tree

18 files changed

+209
-34
lines changed

18 files changed

+209
-34
lines changed

‎.travis.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,28 @@ matrix:
1313
env: TARGET=x86_64-unknown-linux-gnu
1414
install: true
1515
- name: "x86_64-unknown-linux-gnu-emulated (runs all assert_instr tests)"
16-
env: TARGET=x86_64-unknown-linux-gnu-emulated STDSIMD_TEST_EVERYTHING=1 RUSTFLAGS="--cfg stdsimd_intel_sde"
16+
env: TARGET=x86_64-unknown-linux-gnu-emulated STDSIMD_TEST_EVERYTHING=1 RUSTFLAGS="--cfg stdsimd_intel_sde" NOLIBSTDBUILD=1
1717
install: true
1818
- name: "x86_64-linux-android - no assert_instr"
19-
env: TARGET=x86_64-linux-android STDSIMD_DISABLE_ASSERT_INSTR=1
19+
env: TARGET=x86_64-linux-android STDSIMD_DISABLE_ASSERT_INSTR=1 NOLIBSTDBUILD=1
2020
- name: "arm-unknown-linux-gnueabihf"
2121
env: TARGET=arm-unknown-linux-gnueabihf
2222
- name: "arm-linux-androideabi - no assert_instr"
23-
env: TARGET=arm-linux-androideabi STDSIMD_DISABLE_ASSERT_INSTR=1
23+
env: TARGET=arm-linux-androideabi STDSIMD_DISABLE_ASSERT_INSTR=1 NOLIBSTDBUILD=1
2424
- name: "armv7-unknown-linux-gnueabihf - NEON"
2525
env: TARGET=armv7-unknown-linux-gnueabihf RUSTFLAGS="-C target-feature=+neon"
2626
- name: "aarch64-unknown-linux-gnu"
2727
env: TARGET=aarch64-unknown-linux-gnu
2828
- name: "mips-unknown-linux-gnu - build-only"
2929
env: TARGET=mips-unknown-linux-gnu NORUN=1
3030
- name: "mipsel-unknown-linux-musl - build-only"
31-
env: TARGET=mipsel-unknown-linux-musl NORUN=1
31+
env: TARGET=mipsel-unknown-linux-musl NORUN=1 NOLIBSTDBUILD=1
3232
- name: "mips64-unknown-linux-gnuabi64 - build-only"
3333
env: TARGET=mips64-unknown-linux-gnuabi64 NORUN=1
3434
- name: "mips64el-unknown-linux-gnuabi64 - build-only"
3535
env: TARGET=mips64el-unknown-linux-gnuabi64 NORUN=1
3636
- name: "aarch64-linux-android - no assert_instr"
37-
env: TARGET=aarch64-linux-android STDSIMD_DISABLE_ASSERT_INSTR=1
37+
env: TARGET=aarch64-linux-android STDSIMD_DISABLE_ASSERT_INSTR=1 NOLIBSTDBUILD=1
3838
- name: "powerpc-unknown-linux-gnu - no assert_instr"
3939
env: TARGET=powerpc-unknown-linux-gnu STDSIMD_DISABLE_ASSERT_INSTR=1
4040
- name: "powerpc64-unknown-linux-gnu - no assert_instr, no simd_test"
@@ -57,16 +57,16 @@ matrix:
5757
- name: "wasm32-unknown-unknown"
5858
env: TARGET=wasm32-unknown-unknown
5959
- name: "thumbv6m-none-eabi - build libcore only"
60-
env: TARGET=thumbv6m-none-eabi NORUN=1 NOSTD=1
60+
env: TARGET=thumbv6m-none-eabi NORUN=1 NOSTD=1 NOLIBSTDBUILD=1
6161
script: ci/run.sh
6262
- name: "thumbv7m-none-eabi - build libcore only"
63-
env: TARGET=thumbv7m-none-eabi NORUN=1 NOSTD=1
63+
env: TARGET=thumbv7m-none-eabi NORUN=1 NOSTD=1 NOLIBSTDBUILD=1
6464
script: ci/run.sh
6565
- name: "thumbv7em-none-eabi - build libcore only"
66-
env: TARGET=thumbv7em-none-eabi NORUN=1 NOSTD=1
66+
env: TARGET=thumbv7em-none-eabi NORUN=1 NOSTD=1 NOLIBSTDBUILD=1
6767
script: ci/run.sh
6868
- name: "thumbv7em-none-eabihf - build libcore only"
69-
env: TARGET=thumbv7em-none-eabihf NORUN=1 NOSTD=1
69+
env: TARGET=thumbv7em-none-eabihf NORUN=1 NOSTD=1 NOLIBSTDBUILD=1
7070
script: ci/run.sh
7171
- name: "x86_64-pc-windows-msvc"
7272
env: TARGET=x86_64-pc-windows-msvc
@@ -75,16 +75,16 @@ matrix:
7575
install: true
7676
- name: "x86_64-pc-windows-gnu - no assert_instr"
7777
# FIXME: https://github.com/rust-lang-nursery/stdsimd/issues/595
78-
env: TARGET=x86_64-pc-windows-gnu STDSIMD_DISABLE_ASSERT_INSTR=1
78+
env: TARGET=x86_64-pc-windows-gnu STDSIMD_DISABLE_ASSERT_INSTR=1 NOLIBSTDBUILD=1
7979
os: windows
8080
script: ci/run.sh
8181
- name: "i686-pc-windows-msvc - no assert_instr"
8282
# FIXME: https://github.com/rust-lang-nursery/stdsimd/issues/595
83-
env: TARGET=i686-pc-windows-msvc STDSIMD_DISABLE_ASSERT_INSTR=1
83+
env: TARGET=i686-pc-windows-msvc STDSIMD_DISABLE_ASSERT_INSTR=1 NOLIBSTDBUILD=1
8484
os: windows
8585
script: ci/run.sh
8686
- name: "i686-pc-windows-gnu"
87-
env: TARGET=i686-pc-windows-gnu
87+
env: TARGET=i686-pc-windows-gnu STDSIMD_DISABLE_ASSERT_INSTR=1 NOLIBSTDBUILD=1
8888
os: windows
8989
script: ci/run.sh
9090
- name: "Documentation"
@@ -109,8 +109,8 @@ matrix:
109109
- shellcheck ci/*.sh
110110
allow_failures:
111111
# FIXME: https://github.com/rust-lang/rust/issues/56153
112-
- env: TARGET=x86_64-pc-windows-gnu STDSIMD_DISABLE_ASSERT_INSTR=1
113-
- env: TARGET=i686-pc-windows-gnu
112+
- env: TARGET=x86_64-pc-windows-gnu STDSIMD_DISABLE_ASSERT_INSTR=1 NOLIBSTDBUILD=1
113+
- env: TARGET=i686-pc-windows-gnu STDSIMD_DISABLE_ASSERT_INSTR=1 NOLIBSTDBUILD=1
114114

115115
install: rustup target add $TARGET
116116
script:

‎ci/docker/aarch64-unknown-linux-gnu/Dockerfile

+12-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
77
libc6-dev-arm64-cross \
88
qemu-user \
99
make \
10-
file
10+
file \
11+
g++ \
12+
g++-aarch64-linux-gnu \
13+
git \
14+
python \
15+
curl \
16+
bzip2 \
17+
perl \
18+
wget \
19+
autoconf \
20+
gettext
21+
1122

1223
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
1324
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="qemu-aarch64 -L /usr/aarch64-linux-gnu" \

‎ci/docker/arm-unknown-linux-gnueabihf/Dockerfile

+12-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
77
libc6-dev-armhf-cross \
88
qemu-user \
99
make \
10-
file
10+
file \
11+
g++ \
12+
g++-arm-linux-gnueabihf \
13+
git \
14+
python \
15+
curl \
16+
bzip2 \
17+
perl \
18+
wget \
19+
autoconf \
20+
gettext
21+
1122
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
1223
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -L /usr/arm-linux-gnueabihf" \
1324
OBJDUMP=arm-linux-gnueabihf-objdump

‎ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile

+12-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
77
libc6-dev-armhf-cross \
88
qemu-user \
99
make \
10-
file
10+
file \
11+
g++ \
12+
g++-arm-linux-gnueabihf \
13+
git \
14+
python \
15+
curl \
16+
bzip2 \
17+
perl \
18+
wget \
19+
autoconf \
20+
gettext
21+
1122
ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
1223
CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -L /usr/arm-linux-gnueabihf" \
1324
OBJDUMP=arm-linux-gnueabihf-objdump

‎ci/docker/i586-unknown-linux-gnu/Dockerfile

+11-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
44
libc6-dev \
55
file \
66
make \
7-
ca-certificates
7+
ca-certificates \
8+
g++-multilib \
9+
git \
10+
python \
11+
curl \
12+
bzip2 \
13+
perl \
14+
wget \
15+
autoconf \
16+
gettext
17+

‎ci/docker/i686-unknown-linux-gnu/Dockerfile

+11-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
44
libc6-dev \
55
file \
66
make \
7-
ca-certificates
7+
ca-certificates \
8+
g++-multilib \
9+
git \
10+
python \
11+
curl \
12+
bzip2 \
13+
perl \
14+
wget \
15+
autoconf \
16+
gettext
17+

‎ci/docker/mips-unknown-linux-gnu/Dockerfile

+12-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
66
qemu-system-mips \
77
qemu-user \
88
make \
9-
file
9+
file \
10+
g++ \
11+
g++-mips-linux-gnu \
12+
git \
13+
python \
14+
curl \
15+
bzip2 \
16+
perl \
17+
wget \
18+
autoconf \
19+
gettext
20+
1021

1122
ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER=mips-linux-gnu-gcc \
1223
CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_RUNNER="qemu-mips -L /usr/mips-linux-gnu" \

‎ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile

+11-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,17 @@ FROM ubuntu:17.10
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \
55
gcc-mips64-linux-gnuabi64 libc6-dev-mips64-cross \
6-
qemu-system-mips64 qemu-user
6+
qemu-system-mips64 qemu-user \
7+
g++ \
8+
g++-mips64-linux-gnuabi64 \
9+
git \
10+
python \
11+
curl \
12+
bzip2 \
13+
perl \
14+
wget \
15+
autoconf \
16+
gettext
717

818
ENV CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc \
919
CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_RUNNER="qemu-mips64 -L /usr/mips64-linux-gnuabi64" \

‎ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile

+12-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,18 @@ FROM ubuntu:17.10
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \
55
gcc-mips64el-linux-gnuabi64 libc6-dev-mips64el-cross \
6-
qemu-system-mips64el
6+
qemu-system-mips64el \
7+
g++ \
8+
g++-mips64el-linux-gnuabi64 \
9+
git \
10+
python \
11+
curl \
12+
bzip2 \
13+
perl \
14+
wget \
15+
autoconf \
16+
gettext
17+
718

819
ENV CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER=mips64el-linux-gnuabi64-gcc \
920
CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_RUNNER="qemu-mips64el -L /usr/mips64el-linux-gnuabi64" \

‎ci/docker/mipsel-unknown-linux-musl/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ RUN apt-get update && \
1212
curl \
1313
file
1414

15+
1516
RUN mkdir /toolchain
1617

1718
# Note that this originally came from:

‎ci/docker/powerpc-unknown-linux-gnu/Dockerfile

+11-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
55
gcc-powerpc-linux-gnu libc6-dev-powerpc-cross \
66
qemu-system-ppc \
77
make \
8-
file
8+
file \
9+
g++ \
10+
g++-powerpc-linux-gnu \
11+
git \
12+
python \
13+
curl \
14+
bzip2 \
15+
perl \
16+
wget \
17+
autoconf \
18+
gettext
919

1020
ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-linux-gnu-gcc \
1121
CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc -cpu Vger -L /usr/powerpc-linux-gnu" \

‎ci/docker/powerpc64-unknown-linux-gnu/Dockerfile

+11-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
qemu-user \
1010
qemu-system-ppc \
1111
make \
12-
file
12+
file \
13+
g++ \
14+
g++-powerpc64-linux-gnu \
15+
git \
16+
python \
17+
curl \
18+
bzip2 \
19+
perl \
20+
wget \
21+
autoconf \
22+
gettext
1323

1424
ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-linux-gnu-gcc \
1525
CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc64 -L /usr/powerpc64-linux-gnu" \

‎ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile

+12-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,18 @@ FROM ubuntu:17.10
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \
55
gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross \
6-
qemu-system-ppc file make
6+
qemu-system-ppc file make \
7+
g++ \
8+
g++-powerpc64le-linux-gnu \
9+
git \
10+
python \
11+
curl \
12+
bzip2 \
13+
perl \
14+
wget \
15+
autoconf \
16+
gettext
17+
718

819
ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc \
920
CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc64le -L /usr/powerpc64le-linux-gnu" \

‎ci/docker/s390x-unknown-linux-gnu/Dockerfile

+11-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
66
gcc-s390x-linux-gnu libc6-dev-s390x-cross \
77
qemu-user \
88
make \
9-
file
9+
file \
10+
g++ \
11+
g++-s390x-linux-gnu \
12+
git \
13+
python \
14+
curl \
15+
bzip2 \
16+
perl \
17+
wget \
18+
autoconf \
19+
gettext
1020

1121
ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \
1222
CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER="qemu-s390x -L /usr/s390x-linux-gnu" \

‎ci/docker/wasm32-unknown-unknown/Dockerfile

+10-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,16 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
99
libc6-dev \
1010
make \
1111
python \
12-
xz-utils
12+
xz-utils \
13+
g++ \
14+
git \
15+
python \
16+
curl \
17+
bzip2 \
18+
perl \
19+
wget \
20+
autoconf \
21+
gettext
1322

1423
# Install `wasm2wat`
1524
RUN git clone --recursive https://github.com/WebAssembly/wabt

‎ci/docker/x86_64-unknown-linux-gnu/Dockerfile

+10-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
44
libc6-dev \
55
file \
66
make \
7-
ca-certificates
7+
ca-certificates \
8+
g++ \
9+
git \
10+
python \
11+
curl \
12+
bzip2 \
13+
perl \
14+
wget \
15+
autoconf \
16+
gettext

‎ci/run-docker.sh

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ run() {
99
echo "Building docker container for TARGET=${1}"
1010
docker build -t stdsimd -f "ci/docker/${1}/Dockerfile" ci/
1111
mkdir -p target
12+
mkdir -p ../rustc
1213
target=$(echo "${1}" | sed 's/-emulated//')
1314
echo "Running docker"
1415
# shellcheck disable=SC2016
@@ -25,10 +26,12 @@ run() {
2526
--env STDSIMD_DISABLE_ASSERT_INSTR \
2627
--env NOSTD \
2728
--env NORUN \
29+
--env NOLIBSTDBUILD \
2830
--env RUSTFLAGS \
2931
--env STDSIMD_TEST_NORUN \
3032
--volume "$(pwd)":/checkout:ro \
3133
--volume "$(pwd)"/target:/checkout/target \
34+
--volume "$(pwd)"/../rustc:/rustc \
3235
--workdir /checkout \
3336
--privileged \
3437
stdsimd \

0 commit comments

Comments
 (0)