Try to fix s390x test

Author: malbarbo

.travis.yml

@@ -29,80 +29,7 @@ env:
     secure: "e2/3QjgRN9atOuSHp22TrYG7QVKcYUWY48Hi9b60w+r1+BhPkTseIJLte7WefRhdXtqpjjUJTooKDhnurFOeHaCT+nmBgiv+FPU893sBl4bhesY4m0vgUJVbNZcs6lTImYekWVb+aqjGdgV/XAgCw7c3kPmrZV0MzGDWL64Xaps="
 matrix:
   include:
-    # 1.0.0 compat
-    - env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
-      rust: 1.0.0
-      script: rm -f Cargo.lock && cargo build
-      install:
-
-    # build documentation
-    - env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
-      rust: nightly
-      script: sh ci/dox.sh
-
-    # stable compat
-    - env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
-    - env: TARGET=i686-unknown-linux-gnu
-    - os: osx
-      env: TARGET=x86_64-apple-darwin NO_ADD=1
-      osx_image: xcode8.3
-    - os: osx
-      env: TARGET=i686-apple-darwin
-      osx_image: xcode8.3
-    - env: TARGET=arm-linux-androideabi
-    - env: TARGET=aarch64-linux-android
-    - env: TARGET=i686-linux-android
-    - env: TARGET=x86_64-linux-android
-    - env: TARGET=x86_64-unknown-linux-musl
-    - env: TARGET=i686-unknown-linux-musl
-    - env: TARGET=arm-unknown-linux-gnueabihf
-    - env: TARGET=arm-unknown-linux-musleabihf
-    - env: TARGET=aarch64-unknown-linux-gnu
-    - env: TARGET=aarch64-unknown-linux-musl
-      rust: beta
-    - os: osx
-      osx_image: xcode8.2
-      env: TARGET=i386-apple-ios
-           CARGO_TARGET_I386_APPLE_IOS_RUNNER=$HOME/runtest
-           RUSTFLAGS=-Clink-arg=-mios-simulator-version-min=7.0
-      before_install:
-        rustc ./ci/ios/deploy_and_run_on_ios_simulator.rs -o $HOME/runtest
-    - os: osx
-      osx_image: xcode8.2
-      env: TARGET=x86_64-apple-ios
-           CARGO_TARGET_X86_64_APPLE_IOS_RUNNER=$HOME/runtest
-           RUSTFLAGS=-Clink-arg=-mios-simulator-version-min=7.0
-      before_install:
-        rustc ./ci/ios/deploy_and_run_on_ios_simulator.rs -o $HOME/runtest
-    - env: TARGET=x86_64-rumprun-netbsd
-    - env: TARGET=powerpc-unknown-linux-gnu
-    - env: TARGET=powerpc64-unknown-linux-gnu
-    - env: TARGET=mips-unknown-linux-musl
-    - env: TARGET=mipsel-unknown-linux-musl
-    - env: TARGET=mips64-unknown-linux-gnuabi64
-    - env: TARGET=mips-unknown-linux-gnu
     - env: TARGET=s390x-unknown-linux-gnu
-    - env: TARGET=asmjs-unknown-emscripten
-    - env: TARGET=wasm32-unknown-emscripten
-
-    # beta
-    - env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
-      rust: beta
-    - os: osx
-      env: TARGET=x86_64-apple-darwin NO_ADD=1
-      osx_image: xcode8.3
-      rust: beta
-
-    # nightly
-    - env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
-      rust: nightly
-    - os: osx
-      env: TARGET=x86_64-apple-darwin NO_ADD=1
-      osx_image: xcode8.3
-      rust: nightly
-
-    # QEMU based targets that compile in an emulator
-    - env: TARGET=x86_64-unknown-freebsd
 
 notifications:
   email:

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

@@ -5,16 +5,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev \
         gcc-s390x-linux-gnu libc6-dev-s390x-cross \
         debian-archive-keyring debootstrap cpio \
-        binfmt-support qemu-user-static qemu-system-s390x \
-        sshpass openssh-client
+        qemu-system-s390x \
+        sshpass openssh-client \
+        sudo
 
 COPY linux-image.sh /
-RUN bash linux-image.sh "" s390x stretch
 
 RUN cd / && curl -LO https://github.com/qemu/qemu/raw/master/pc-bios/s390-ccw.img
 
 ARG USERID
 RUN adduser --uid $USERID --disabled-login --gecos cross cross
+RUN echo "cross ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/cross
 
 COPY test-runner-s390x /
 ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \

ci/linux-image.sh

@@ -16,16 +16,7 @@ qemu-debootstrap \
     $params \
     $suite \
     $dest \
-    $mirror || true
-
-# HACK: debootstrap calls mount, but mount cannot be executed inside a docker
-# container, so qemu-debootstrap fails. We replace mount with true and continue
-# the bootstrap process. We restore mount after the bootstrap.
-rm -f $dest/var/lib/dpkg/status
-mv $dest/bin/mount /mount.bak
-cp $dest/bin/true $dest/bin/mount
-chroot $dest /debootstrap/debootstrap --second-stage || cat $dest//debootstrap/debootstrap.log && false
-mv -f /mount.bak $dest/bin/mount
+    $mirror || cat $dest/debootstrap/debootstrap.log && false
 
 # ssh
 chroot $dest adduser --disabled-password --gecos "" cross

ci/run-docker.sh

@@ -13,6 +13,7 @@ run() {
     fi
     docker run \
       --user `id -u`:`id -g` \
+      --privileged \
       --rm \
       --init \
       --volume $HOME/.cargo:/cargo \

ci/run.sh

@@ -68,4 +68,13 @@ if [ "$QEMU" != "" ]; then
   exec grep "^PASSED .* tests" $CARGO_TARGET_DIR/out.log
 fi
 
+if [ "$TARGET" = "s390x-unknown-linux-gnu" ]; then
+  sudo apt-get install -y --no-install-recommends binfmt-support
+  sudo mount
+  sudo mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc || true
+  sudo apt-get install -y --no-install-recommends qemu-user-static
+  sudo mount
+  sudo bash /linux-image.sh "" s390x stretch
+fi
+
 exec cargo test --manifest-path libc-test/Cargo.toml --target $TARGET