diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-07-07 14:18:19 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-07-07 14:19:06 -0700 |
| commit | 7d74c0993c044e40aa53c65c45ba7b4735d4f398 (patch) | |
| tree | 86f74cd8e7341e497c3dbc0aaed7c225b770d4c4 /ci | |
| parent | e8140b86ab99096410897a0a4ebe6efe1b593261 (diff) | |
| download | rust-libc-7d74c0993c044e40aa53c65c45ba7b4735d4f398.tar.gz | |
Clean up CI configuration and add s390x
We can't test s390x because qemu segfaults but we can at least verify that it
compiles.
Closes #650
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/docker/s390x-unknown-linux-gnu/Dockerfile | 9 | ||||
| -rwxr-xr-x | ci/run.sh | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/ci/docker/s390x-unknown-linux-gnu/Dockerfile b/ci/docker/s390x-unknown-linux-gnu/Dockerfile new file mode 100644 index 0000000000..cbcfdf3592 --- /dev/null +++ b/ci/docker/s390x-unknown-linux-gnu/Dockerfile @@ -0,0 +1,9 @@ +FROM ubuntu:17.04 + +RUN apt-get update && apt-get install -y --no-install-recommends \ + gcc libc6-dev qemu-user ca-certificates \ + gcc-s390x-linux-gnu libc6-dev-s390x-cross + +ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \ + CC_s390x_unknown_linux_gnu=s390x-linux-gnu-gcc \ + PATH=$PATH:/rust/bin @@ -168,6 +168,11 @@ case "$TARGET" in qemu-aarch64 -L /usr/aarch64-linux-gnu/ $CARGO_TARGET_DIR/$TARGET/debug/libc-test ;; + s390x-unknown-linux-gnu) + # TODO: in theory we should execute this, but qemu segfaults immediately :( + # qemu-s390x -L /usr/s390x-linux-gnu/ $CARGO_TARGET_DIR/$TARGET/debug/libc-test + ;; + *-rumprun-netbsd) rumprun-bake hw_virtio /tmp/libc-test.img $CARGO_TARGET_DIR/$TARGET/debug/libc-test qemu-system-x86_64 -nographic -vga none -m 64 \ |