From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 9 Sep 2014 15:08:30 +0000 (-0700)
Subject: Test fixes from the rollup
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=e5abe15ff55212c60fc4acc9bfc2bc79038507b8;p=rust.git

Test fixes from the rollup
---

diff --git a/src/test/compile-fail/feature-gate-advanced-slice-features.rs b/src/test/compile-fail/feature-gate-advanced-slice-features.rs
index c6753baf057..97d593d310e 100644
--- a/src/test/compile-fail/feature-gate-advanced-slice-features.rs
+++ b/src/test/compile-fail/feature-gate-advanced-slice-features.rs
@@ -11,9 +11,9 @@
 fn main() {
     let x = [ 1i, 2, 3, 4, 5 ];
     match x {
-        [ ..xs, 4, 5 ] => {}    //~ ERROR multiple-element slice matches
-        [ 1, ..xs, 5 ] => {}    //~ ERROR multiple-element slice matches
-        [ 1, 2, ..xs ] => {}    // OK without feature gate
+        [ xs.., 4, 5 ] => {}    //~ ERROR multiple-element slice matches
+        [ 1, xs.., 5 ] => {}    //~ ERROR multiple-element slice matches
+        [ 1, 2, xs.. ] => {}    // OK without feature gate
     }
 }
 
diff --git a/src/test/run-pass-fulldeps/issue-16992.rs b/src/test/run-pass-fulldeps/issue-16992.rs
index 71fab67b819..563b8394963 100644
--- a/src/test/run-pass-fulldeps/issue-16992.rs
+++ b/src/test/run-pass-fulldeps/issue-16992.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // ignore-pretty
+// ignore-android
 
 #![feature(quote)]