Merge pull request #21 from japaric/qemu

don't run tests on targets that have QEMU issues

Author: Jorge Aparicio

.travis.yml

@@ -80,19 +80,6 @@ matrix:
       os: osx
     - env: TARGET=x86_64-unknown-linux-gnu
       os: linux
-  allow_failures:
-    # FIXME(#2)
-    - env: TARGET=armv7-unknown-linux-gnueabihf
-      os: linux
-    # FIXME QEMU blows up
-    - env: TARGET=mips-unknown-linux-gnu
-      os: linux
-    # FIXME QEMU blows up
-    - env: TARGET=powerpc64-unknown-linux-gnu
-      os: linux
-    # FIXME QEMU blows up
-    - env: TARGET=powerpc64le-unknown-linux-gnu
-      os: linux
 
 before_install:
   - export PATH="$PATH:$HOME/.cargo/bin"

ci/env.sh

@@ -20,11 +20,19 @@ case $TARGET in
         export PREFIX=arm-linux-gnueabi-
         export QEMU_LD_PREFIX=/usr/arm-linux-gnueabi
         ;;
-    arm*-unknown-linux-gnueabihf)
+    arm-unknown-linux-gnueabihf)
+        export PREFIX=arm-linux-gnueabihf-
+        export QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf
+        ;;
+    armv7-unknown-linux-gnueabihf)
+        # See #2
+        export DONT_RUN_TESTS=y
         export PREFIX=arm-linux-gnueabihf-
         export QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf
         ;;
     mips-unknown-linux-gnu)
+        # See #2
+        export DONT_RUN_TESTS=y
         # NOTE $DOCKER values: 'y' (yes, call docker), 'i' (inside a docker container) or 'n' ("no)
         if [[ -z $DOCKER ]]; then
             export DOCKER=y
@@ -34,7 +42,6 @@ case $TARGET in
         export QEMU_LD_PREFIX=/usr/mips-linux-gnu
         ;;
     mipsel-unknown-linux-gnu)
-        # NOTE $DOCKER values: 'y' (yes, call docker), 'i' (inside a docker container) or 'n' ("no)
         if [[ -z $DOCKER ]]; then
             export DOCKER=y
         fi
@@ -47,6 +54,8 @@ case $TARGET in
         export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu
         ;;
     powerpc64-unknown-linux-gnu)
+        # See #2
+        export DONT_RUN_TESTS=y
         if [[ -z $DOCKER ]]; then
             export DOCKER=y
         fi
@@ -55,6 +64,8 @@ case $TARGET in
         export QEMU_LD_PREFIX=/usr/powerpc64-linux-gnu
         ;;
     powerpc64le-unknown-linux-gnu)
+        # See #2
+        export DONT_RUN_TESTS=y
         if [[ -z $DOCKER ]]; then
             export DOCKER=y
         fi

ci/script.sh

@@ -14,10 +14,14 @@ run_tests() {
 
     if [[ $QEMU ]]; then
         cargo test --target $TARGET --no-run
-        $QEMU target/**/debug/rustc_builtins-*
+        if [[ -z $DONT_RUN_TESTS ]]; then
+           $QEMU target/**/debug/rustc_builtins-*
+        fi
         cargo test --target $TARGET --release --no-run
-        $QEMU target/**/release/rustc_builtins-*
-    else
+        if [[ -z $DONT_RUN_TESTS ]]; then
+            $QEMU target/**/release/rustc_builtins-*
+        fi
+    elif [[ -z $DONT_RUN_TESTS ]]; then
         cargo test --target $TARGET
         cargo test --target $TARGET --release
     fi