Auto merge of #857 - alexcrichton:fix, r=alexcrichton

Fix master CI

Apparently the most recently release broke three (!) platforms!

Author: bors

.travis.yml

@@ -53,7 +53,8 @@ matrix:
     - env: TARGET=arm-unknown-linux-musleabihf
     - env: TARGET=aarch64-unknown-linux-gnu
     - env: TARGET=aarch64-unknown-linux-musl
-      rust: beta
+      # FIXME(#856)
+      rust: 1.22.1
     - os: osx
       osx_image: xcode8.2
       env: TARGET=i386-apple-ios

ci/docker/wasm32-unknown-emscripten/node-wrapper.sh

@@ -7,5 +7,9 @@ shift
 dir=$(dirname $me)
 file=$(basename $me)
 
+if echo $file | grep -q wasm; then
+  exit 0 # FIXME(rust-lang/cargo#4750)
+fi
+
 cd $dir
 exec node $file "$@"

ci/run.sh

@@ -41,7 +41,11 @@ if [ "$QEMU" != "" ]; then
 
   # Do the standard rigamarole of cross-compiling an executable and then the
   # script to run just executes the binary.
-  cargo build --manifest-path libc-test/Cargo.toml --target $TARGET --tests
+  cargo build \
+    --manifest-path libc-test/Cargo.toml \
+    --target $TARGET \
+    --test main
+  rm $CARGO_TARGET_DIR/$TARGET/debug/main-*.d
   cp $CARGO_TARGET_DIR/$TARGET/debug/main-* $tmpdir/mount/libc-test
   echo 'exec $1/libc-test' > $tmpdir/mount/run.sh