about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgnzlbg <gonzalobg88@gmail.com>2018-05-18 12:56:38 +0200
committergnzlbg <gonzalobg88@gmail.com>2018-05-24 16:04:39 +0200
commit7bbbc79c480e78e7abd6e6a8ae545da0f8ef7f99 (patch)
treef6ce7e7ec30a52c253a8ca0d574d1a9cc7e585ed
parentc803ee455beb5842f4acc430e2184ba6943315c0 (diff)
downloadrust-7bbbc79c480e78e7abd6e6a8ae545da0f8ef7f99.tar.gz
rust-7bbbc79c480e78e7abd6e6a8ae545da0f8ef7f99.zip
ignore arm-android
-rw-r--r--.travis.yml34
-rw-r--r--src/test/run-pass/simd-intrinsic-float-math.rs1
2 files changed, 18 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index 87d24203ebe..9e62b895ed2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,7 @@ matrix:
         CI_JOB_NAME=x86_64-apple
       os: osx
       osx_image: xcode9.3-moar
-      #if: branch = auto
+      if: branch = auto
 
     - env: >
         RUST_CHECK_TARGET=check
@@ -71,7 +71,7 @@ matrix:
         CI_JOB_NAME=i686-apple
       os: osx
       osx_image: xcode9.3-moar
-      #if: branch = auto
+      if: branch = auto
 
     # OSX builders producing releases. These do not run the full test suite and
     # just produce a bunch of artifacts.
@@ -109,7 +109,7 @@ matrix:
 
     # Linux builders, remaining docker images
     - env: IMAGE=arm-android
-      #if: branch = auto
+      if: branch = auto
     - env: IMAGE=armhf-gnu
       if: branch = auto
     - env: IMAGE=dist-various-1 DEPLOY=1
@@ -117,17 +117,17 @@ matrix:
     - env: IMAGE=dist-various-2 DEPLOY=1
       if: branch = auto
     - env: IMAGE=dist-aarch64-linux DEPLOY=1
-      #if: branch = auto
+      if: branch = auto
     - env: IMAGE=dist-android DEPLOY=1
-      #if: branch = auto
+      if: branch = auto
     - env: IMAGE=dist-arm-linux DEPLOY=1
-      #if: branch = auto
+      if: branch = auto
     - env: IMAGE=dist-armhf-linux DEPLOY=1
-      #if: branch = auto
+      if: branch = auto
     - env: IMAGE=dist-armv7-linux DEPLOY=1
-      #if: branch = auto
+      if: branch = auto
     - env: IMAGE=dist-i586-gnu-i586-i686-musl DEPLOY=1
-      #if: branch = auto
+      if: branch = auto
     - env: IMAGE=dist-i686-freebsd DEPLOY=1
       if: branch = auto
     - env: IMAGE=dist-i686-linux DEPLOY=1
@@ -137,17 +137,17 @@ matrix:
     - env: IMAGE=dist-mips64-linux DEPLOY=1
       if: branch = auto
     - env: IMAGE=dist-mips64el-linux DEPLOY=1
-      #if: branch = auto
+      if: branch = auto
     - env: IMAGE=dist-mipsel-linux DEPLOY=1
-      #if: branch = auto
+      if: branch = auto
     - env: IMAGE=dist-powerpc-linux DEPLOY=1
-      #if: branch = auto
+      if: branch = auto
     - env: IMAGE=dist-powerpc64-linux DEPLOY=1
       if: branch = auto
     - env: IMAGE=dist-powerpc64le-linux DEPLOY=1
-      #if: branch = auto
+      if: branch = auto
     - env: IMAGE=dist-s390x-linux DEPLOY=1
-      #if: branch = auto
+      if: branch = auto
     - env: IMAGE=dist-x86_64-freebsd DEPLOY=1
       if: branch = auto
     - env: IMAGE=dist-x86_64-musl DEPLOY=1
@@ -157,13 +157,13 @@ matrix:
     - env: IMAGE=asmjs
       if: branch = auto
     - env: IMAGE=i686-gnu
-      #if: branch = auto
+      if: branch = auto
     - env: IMAGE=i686-gnu-nopt
-      #if: branch = auto
+      if: branch = auto
     - env: IMAGE=wasm32-unknown
       if: branch = auto
     - env: IMAGE=x86_64-gnu
-      #if: branch = auto
+      if: branch = auto
     - env: IMAGE=x86_64-gnu-full-bootstrap
       if: branch = auto
     - env: IMAGE=x86_64-gnu-aux
diff --git a/src/test/run-pass/simd-intrinsic-float-math.rs b/src/test/run-pass/simd-intrinsic-float-math.rs
index fe383f0627d..1608100fea0 100644
--- a/src/test/run-pass/simd-intrinsic-float-math.rs
+++ b/src/test/run-pass/simd-intrinsic-float-math.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // ignore-emscripten
+// ignore-arm-android
 
 // Test that the simd floating-point math intrinsics produce correct results.