From 165ce14f687e4d20733795e3465dedc5d77ec49b Mon Sep 17 00:00:00 2001 From: Tim Chevalier Date: Sat, 27 Oct 2012 17:18:15 -0700 Subject: [PATCH] Remove xfail-pretty from tests that pretty-print correctly now --- src/test/bench/core-std.rs | 1 - src/test/bench/msgsend-pipes-shared.rs | 2 -- src/test/bench/msgsend-pipes.rs | 2 -- src/test/bench/msgsend-ring-mutex-arcs.rs | 2 -- src/test/bench/msgsend-ring-pipes.rs | 2 -- src/test/bench/msgsend-ring-rw-arcs.rs | 2 -- src/test/bench/pingpong.rs | 2 -- src/test/bench/shootout-pfib.rs | 1 - src/test/compile-fail/qquote-1.rs | 1 - src/test/compile-fail/qquote-2.rs | 1 - src/test/run-pass/fat-arrow-alt.rs | 1 - src/test/run-pass/html-literals.rs | 1 - src/test/run-pass/issue-2718.rs | 1 - src/test/run-pass/pipe-bank-proto.rs | 1 - src/test/run-pass/pipe-detect-term.rs | 1 - src/test/run-pass/pipe-peek.rs | 1 - src/test/run-pass/pipe-pingpong-bounded.rs | 1 - src/test/run-pass/pipe-pingpong-proto.rs | 1 - src/test/run-pass/pipe-presentation-examples.rs | 1 - src/test/run-pass/pipe-sleep.rs | 1 - src/test/run-pass/rec-align-u32.rs | 1 - src/test/run-pass/rec-align-u64.rs | 1 - src/test/run-pass/reexport-star.rs | 1 - src/test/run-pass/test-ignore-cfg.rs | 1 - src/test/run-pass/unreachable-code-1.rs | 1 - src/test/run-pass/unreachable-code.rs | 1 - 26 files changed, 32 deletions(-) diff --git a/src/test/bench/core-std.rs b/src/test/bench/core-std.rs index 550da39cb11e..6f90a2c99e81 100644 --- a/src/test/bench/core-std.rs +++ b/src/test/bench/core-std.rs @@ -1,4 +1,3 @@ -// xfail-pretty // Microbenchmarks for various functions in core and std extern mod std; diff --git a/src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/msgsend-pipes-shared.rs index 55afa0490918..397b17be7c0f 100644 --- a/src/test/bench/msgsend-pipes-shared.rs +++ b/src/test/bench/msgsend-pipes-shared.rs @@ -8,8 +8,6 @@ // different scalability characteristics compared to the select // version. -// xfail-pretty - #[legacy_modes]; extern mod std; diff --git a/src/test/bench/msgsend-pipes.rs b/src/test/bench/msgsend-pipes.rs index f0fc1dd5f001..12e0035afe8c 100644 --- a/src/test/bench/msgsend-pipes.rs +++ b/src/test/bench/msgsend-pipes.rs @@ -4,8 +4,6 @@ // // I *think* it's the same, more or less. -// xfail-pretty - #[legacy_modes]; extern mod std; diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/msgsend-ring-mutex-arcs.rs index 82b8e2410a96..ac2fc1f5258a 100644 --- a/src/test/bench/msgsend-ring-mutex-arcs.rs +++ b/src/test/bench/msgsend-ring-mutex-arcs.rs @@ -5,8 +5,6 @@ // This also serves as a pipes test, because ARCs are implemented with pipes. -// xfail-pretty - extern mod std; use std::time; use std::arc; diff --git a/src/test/bench/msgsend-ring-pipes.rs b/src/test/bench/msgsend-ring-pipes.rs index de4332b692a1..636fef53732d 100644 --- a/src/test/bench/msgsend-ring-pipes.rs +++ b/src/test/bench/msgsend-ring-pipes.rs @@ -6,8 +6,6 @@ // This version uses automatically compiled channel contracts. -// xfail-pretty - extern mod std; use std::time; use std::future; diff --git a/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/msgsend-ring-rw-arcs.rs index 375ff8f50d86..ae0099b23274 100644 --- a/src/test/bench/msgsend-ring-rw-arcs.rs +++ b/src/test/bench/msgsend-ring-rw-arcs.rs @@ -5,8 +5,6 @@ // This also serves as a pipes test, because ARCs are implemented with pipes. -// xfail-pretty - extern mod std; use std::time; use std::arc; diff --git a/src/test/bench/pingpong.rs b/src/test/bench/pingpong.rs index fc2025511947..17987fba2f82 100644 --- a/src/test/bench/pingpong.rs +++ b/src/test/bench/pingpong.rs @@ -1,7 +1,5 @@ // Compare bounded and unbounded protocol performance. -// xfail-pretty - extern mod std; use pipes::{spawn_service, recv}; diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs index e70b796298be..dbb445c89e4b 100644 --- a/src/test/bench/shootout-pfib.rs +++ b/src/test/bench/shootout-pfib.rs @@ -1,5 +1,4 @@ // -*- rust -*- -// xfail-pretty /* A parallel version of fibonacci numbers. diff --git a/src/test/compile-fail/qquote-1.rs b/src/test/compile-fail/qquote-1.rs index 344c87538819..c7911c76218e 100644 --- a/src/test/compile-fail/qquote-1.rs +++ b/src/test/compile-fail/qquote-1.rs @@ -1,4 +1,3 @@ -// xfail-pretty extern mod std; extern mod syntax; diff --git a/src/test/compile-fail/qquote-2.rs b/src/test/compile-fail/qquote-2.rs index 656d75c5a40d..2c34943ac577 100644 --- a/src/test/compile-fail/qquote-2.rs +++ b/src/test/compile-fail/qquote-2.rs @@ -1,4 +1,3 @@ -// xfail-pretty extern mod std; use syntax; diff --git a/src/test/run-pass/fat-arrow-alt.rs b/src/test/run-pass/fat-arrow-alt.rs index 5c80ebfae234..935d962d2bb7 100644 --- a/src/test/run-pass/fat-arrow-alt.rs +++ b/src/test/run-pass/fat-arrow-alt.rs @@ -1,5 +1,4 @@ // -*- rust -*- -// xfail-pretty enum color { red, diff --git a/src/test/run-pass/html-literals.rs b/src/test/run-pass/html-literals.rs index dc8abc532979..e2c1b9fbdfb3 100644 --- a/src/test/run-pass/html-literals.rs +++ b/src/test/run-pass/html-literals.rs @@ -1,6 +1,5 @@ // A test of the macro system. Can we do HTML literals? -// xfail-pretty /* diff --git a/src/test/run-pass/issue-2718.rs b/src/test/run-pass/issue-2718.rs index 7b8ff9b86b02..ebc601245963 100644 --- a/src/test/run-pass/issue-2718.rs +++ b/src/test/run-pass/issue-2718.rs @@ -1,5 +1,4 @@ // tjc: I don't know why -// xfail-pretty mod pipes { #[legacy_exports]; use cast::{forget, transmute}; diff --git a/src/test/run-pass/pipe-bank-proto.rs b/src/test/run-pass/pipe-bank-proto.rs index 7d7de6d120dc..affa7d54ac72 100644 --- a/src/test/run-pass/pipe-bank-proto.rs +++ b/src/test/run-pass/pipe-bank-proto.rs @@ -1,4 +1,3 @@ -// xfail-pretty // An example of the bank protocol from eholk's blog post. // diff --git a/src/test/run-pass/pipe-detect-term.rs b/src/test/run-pass/pipe-detect-term.rs index 524541780c07..cc5463bd3390 100644 --- a/src/test/run-pass/pipe-detect-term.rs +++ b/src/test/run-pass/pipe-detect-term.rs @@ -1,6 +1,5 @@ // Make sure that we can detect when one end of the pipe is closed. -// xfail-pretty // xfail-win32 extern mod std; diff --git a/src/test/run-pass/pipe-peek.rs b/src/test/run-pass/pipe-peek.rs index e3a2d29747b6..2f26ecff91d0 100644 --- a/src/test/run-pass/pipe-peek.rs +++ b/src/test/run-pass/pipe-peek.rs @@ -1,4 +1,3 @@ -// xfail-pretty extern mod std; use std::timer::sleep; diff --git a/src/test/run-pass/pipe-pingpong-bounded.rs b/src/test/run-pass/pipe-pingpong-bounded.rs index 0db7d6cf123a..f00668e4ba45 100644 --- a/src/test/run-pass/pipe-pingpong-bounded.rs +++ b/src/test/run-pass/pipe-pingpong-bounded.rs @@ -2,7 +2,6 @@ // experiment with what code the compiler should generate for bounded // protocols. -// xfail-pretty // This was generated initially by the pipe compiler, but it's been // modified in hopefully straightforward ways. diff --git a/src/test/run-pass/pipe-pingpong-proto.rs b/src/test/run-pass/pipe-pingpong-proto.rs index c1c74aefa9c8..5a782dbada87 100644 --- a/src/test/run-pass/pipe-pingpong-proto.rs +++ b/src/test/run-pass/pipe-pingpong-proto.rs @@ -1,6 +1,5 @@ // An example to make sure the protocol parsing syntax extension works. -// xfail-pretty proto! pingpong ( ping:send { diff --git a/src/test/run-pass/pipe-presentation-examples.rs b/src/test/run-pass/pipe-presentation-examples.rs index 853aba53eda4..cd5fcaabf5cb 100644 --- a/src/test/run-pass/pipe-presentation-examples.rs +++ b/src/test/run-pass/pipe-presentation-examples.rs @@ -3,7 +3,6 @@ // Code is easier to write in emacs, and it's good to be sure all the // code samples compile (or not) as they should. -// xfail-pretty use double_buffer::client::*; use double_buffer::give_buffer; diff --git a/src/test/run-pass/pipe-sleep.rs b/src/test/run-pass/pipe-sleep.rs index c9975bec9469..57eafb2018d7 100644 --- a/src/test/run-pass/pipe-sleep.rs +++ b/src/test/run-pass/pipe-sleep.rs @@ -1,4 +1,3 @@ -// xfail-pretty extern mod std; use std::timer::sleep; diff --git a/src/test/run-pass/rec-align-u32.rs b/src/test/run-pass/rec-align-u32.rs index 93ef8e755f4f..c5ef4d76f95d 100644 --- a/src/test/run-pass/rec-align-u32.rs +++ b/src/test/run-pass/rec-align-u32.rs @@ -1,4 +1,3 @@ -// xfail-pretty // Issue #2303 #[abi = "rust-intrinsic"] diff --git a/src/test/run-pass/rec-align-u64.rs b/src/test/run-pass/rec-align-u64.rs index 24400b8d3408..6ad737b0b3f3 100644 --- a/src/test/run-pass/rec-align-u64.rs +++ b/src/test/run-pass/rec-align-u64.rs @@ -1,4 +1,3 @@ -// xfail-pretty // Issue #2303 #[abi = "rust-intrinsic"] diff --git a/src/test/run-pass/reexport-star.rs b/src/test/run-pass/reexport-star.rs index daa8d9d67964..f3e8d993943c 100644 --- a/src/test/run-pass/reexport-star.rs +++ b/src/test/run-pass/reexport-star.rs @@ -1,4 +1,3 @@ -// xfail-pretty // FIXME #3654 mod a { diff --git a/src/test/run-pass/test-ignore-cfg.rs b/src/test/run-pass/test-ignore-cfg.rs index 0baabecb0ab9..e6cd3631e55a 100644 --- a/src/test/run-pass/test-ignore-cfg.rs +++ b/src/test/run-pass/test-ignore-cfg.rs @@ -1,6 +1,5 @@ // compile-flags: --test --cfg ignorecfg // xfail-fast -// xfail-pretty extern mod std; diff --git a/src/test/run-pass/unreachable-code-1.rs b/src/test/run-pass/unreachable-code-1.rs index 11cf1fe85f9d..fb35463f0532 100644 --- a/src/test/run-pass/unreachable-code-1.rs +++ b/src/test/run-pass/unreachable-code-1.rs @@ -1,4 +1,3 @@ -// xfail-pretty fn id(x: bool) -> bool { x } diff --git a/src/test/run-pass/unreachable-code.rs b/src/test/run-pass/unreachable-code.rs index 9d34e7a8dc68..4b847c5d83ee 100644 --- a/src/test/run-pass/unreachable-code.rs +++ b/src/test/run-pass/unreachable-code.rs @@ -1,4 +1,3 @@ -// xfail-pretty fn id(x: bool) -> bool { x }