about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2018-12-23 23:09:15 +0100
committerGitHub <noreply@github.com>2018-12-23 23:09:15 +0100
commitdff3e41914905eae0326c00de0dd9befc9d9ae83 (patch)
tree483361b01b6fc40aa26e22a3982ca234389ff67c
parent975a7f01f0df76190d4af3d01ddd8b0d82caa1e8 (diff)
parentecdbcada5de5c4e3d5d46920658f3c4688923659 (diff)
downloadrust-dff3e41914905eae0326c00de0dd9befc9d9ae83.tar.gz
rust-dff3e41914905eae0326c00de0dd9befc9d9ae83.zip
Rollup merge of #57078 - glaubitz:ignore-tests, r=nikic
Ignore two tests on s390x

Ignore two tests on s390x which don't make sense on s390x as they are x86-specific.
-rw-r--r--src/test/codegen/x86_mmx.rs1
-rw-r--r--src/test/ui/target-feature-gate.rs1
-rw-r--r--src/test/ui/target-feature-gate.stderr2
3 files changed, 3 insertions, 1 deletions
diff --git a/src/test/codegen/x86_mmx.rs b/src/test/codegen/x86_mmx.rs
index 4424c30e0f8..0fd3d542438 100644
--- a/src/test/codegen/x86_mmx.rs
+++ b/src/test/codegen/x86_mmx.rs
@@ -18,6 +18,7 @@
 // ignore-powerpc64le
 // ignore-sparc
 // ignore-sparc64
+// ignore-s390x
 // compile-flags: -O
 
 #![feature(repr_simd)]
diff --git a/src/test/ui/target-feature-gate.rs b/src/test/ui/target-feature-gate.rs
index cb0938b861c..9f3a7b5e924 100644
--- a/src/test/ui/target-feature-gate.rs
+++ b/src/test/ui/target-feature-gate.rs
@@ -19,6 +19,7 @@
 // ignore-powerpc64le
 // ignore-sparc
 // ignore-sparc64
+// ignore-s390x
 // gate-test-sse4a_target_feature
 // gate-test-powerpc_target_feature
 // gate-test-avx512_target_feature
diff --git a/src/test/ui/target-feature-gate.stderr b/src/test/ui/target-feature-gate.stderr
index d7154324d12..73da67a9b8f 100644
--- a/src/test/ui/target-feature-gate.stderr
+++ b/src/test/ui/target-feature-gate.stderr
@@ -1,5 +1,5 @@
 error[E0658]: the target feature `avx512bw` is currently unstable (see issue #44839)
-  --> $DIR/target-feature-gate.rs:36:18
+  --> $DIR/target-feature-gate.rs:37:18
    |
 LL | #[target_feature(enable = "avx512bw")]
    |                  ^^^^^^^^^^^^^^^^^^^