From d8d48e4aae6a0766112970095d95bd0cac4bd79c Mon Sep 17 00:00:00 2001 From: John Clements Date: Wed, 25 Jun 2014 17:08:08 -0700 Subject: [PATCH] work around 15189 in test cases --- src/test/run-pass/backtrace.rs | 1 + .../run-pass/deriving-cmp-generic-enum.rs | 2 ++ .../deriving-cmp-generic-struct-enum.rs | 2 ++ .../run-pass/deriving-cmp-generic-struct.rs | 2 ++ .../deriving-cmp-generic-tuple-struct.rs | 2 ++ src/test/run-pass/issue-15189.rs | 21 +++++++++++++++++++ src/test/run-pass/linear-for-loop.rs | 2 ++ src/test/run-pass/task-comm-3.rs | 2 ++ src/test/run-pass/unfold-cross-crate.rs | 2 ++ src/test/run-pass/utf8.rs | 2 ++ 10 files changed, 38 insertions(+) create mode 100644 src/test/run-pass/issue-15189.rs diff --git a/src/test/run-pass/backtrace.rs b/src/test/run-pass/backtrace.rs index 616b247bbb77..3b74ec4add31 100644 --- a/src/test/run-pass/backtrace.rs +++ b/src/test/run-pass/backtrace.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-pretty FIXME #15189 // ignore-win32 FIXME #13259 extern crate native; diff --git a/src/test/run-pass/deriving-cmp-generic-enum.rs b/src/test/run-pass/deriving-cmp-generic-enum.rs index 692a62f4ed0b..4a9324dd201a 100644 --- a/src/test/run-pass/deriving-cmp-generic-enum.rs +++ b/src/test/run-pass/deriving-cmp-generic-enum.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-pretty FIXME #15189 + #[deriving(PartialEq, Eq, PartialOrd, Ord)] enum E { E0, diff --git a/src/test/run-pass/deriving-cmp-generic-struct-enum.rs b/src/test/run-pass/deriving-cmp-generic-struct-enum.rs index 2add2b6711f3..b21c95d7b50c 100644 --- a/src/test/run-pass/deriving-cmp-generic-struct-enum.rs +++ b/src/test/run-pass/deriving-cmp-generic-struct-enum.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-pretty FIXME #15189 + #![feature(struct_variant)] #[deriving(PartialEq, Eq, PartialOrd, Ord)] diff --git a/src/test/run-pass/deriving-cmp-generic-struct.rs b/src/test/run-pass/deriving-cmp-generic-struct.rs index 2576cce6503d..e2b8e1b6b82f 100644 --- a/src/test/run-pass/deriving-cmp-generic-struct.rs +++ b/src/test/run-pass/deriving-cmp-generic-struct.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-pretty FIXME #15189 + #[deriving(PartialEq, Eq, PartialOrd, Ord)] struct S { x: T, diff --git a/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs b/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs index 8ab529996e50..c07f124a08d1 100644 --- a/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs +++ b/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-pretty FIXME #15189 + #[deriving(PartialEq, Eq, PartialOrd, Ord)] struct TS(T,T); diff --git a/src/test/run-pass/issue-15189.rs b/src/test/run-pass/issue-15189.rs new file mode 100644 index 000000000000..abf8b6dbbea4 --- /dev/null +++ b/src/test/run-pass/issue-15189.rs @@ -0,0 +1,21 @@ +// Copyright 2014 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// ignore-pretty + +#![feature(macro_rules)] + +macro_rules! third(($e:expr)=>({let x = 2; *$e.get(x)})) + +fn main() { + let x = vec!(10u,11u,12u,13u); + let t = third!(x); + assert_eq!(t,12u); +} diff --git a/src/test/run-pass/linear-for-loop.rs b/src/test/run-pass/linear-for-loop.rs index 1dc212ba8e95..640ed3883eb8 100644 --- a/src/test/run-pass/linear-for-loop.rs +++ b/src/test/run-pass/linear-for-loop.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-pretty FIXME #15189 + extern crate debug; pub fn main() { diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs index cd31d15db109..1c14153a1101 100644 --- a/src/test/run-pass/task-comm-3.rs +++ b/src/test/run-pass/task-comm-3.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-pretty FIXME #15189 + extern crate debug; use std::task; diff --git a/src/test/run-pass/unfold-cross-crate.rs b/src/test/run-pass/unfold-cross-crate.rs index 1c3eafb20329..d3e70706867b 100644 --- a/src/test/run-pass/unfold-cross-crate.rs +++ b/src/test/run-pass/unfold-cross-crate.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-pretty FIXME #15189 + use std::iter::Unfold; // Unfold had a bug with 'a that mean it didn't work diff --git a/src/test/run-pass/utf8.rs b/src/test/run-pass/utf8.rs index d59ed3a4b625..6cf0d518628e 100644 --- a/src/test/run-pass/utf8.rs +++ b/src/test/run-pass/utf8.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-pretty FIXME #15189 + pub fn main() { let yen: char = '¥'; // 0xa5 let c_cedilla: char = 'ç'; // 0xe7