diff options
| author | Jakub Wieczorek <jakub@jakub.cc> | 2014-09-21 01:45:58 +0200 |
|---|---|---|
| committer | Jakub Wieczorek <jakub@jakub.cc> | 2014-10-16 21:40:12 +0200 |
| commit | f3d46bda657d71610b4db74792fe66d407176d46 (patch) | |
| tree | e53247a7dff5a3d9acfe05d77ce52d0ff0ad0094 | |
| parent | b6e0d3a5bf4c88650a22f605f822e02c6b163580 (diff) | |
| download | rust-f3d46bda657d71610b4db74792fe66d407176d46.tar.gz rust-f3d46bda657d71610b4db74792fe66d407176d46.zip | |
Unignore a few tests
Also, remove one that has an exact duplicate.
| -rw-r--r-- | src/test/compile-fail/non-constant-expr-for-fixed-len-vec.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/dead-code-one-arm-if.rs | 13 | ||||
| -rw-r--r-- | src/test/run-pass/parse-fail.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/trait-inheritance-cast.rs | 10 |
4 files changed, 4 insertions, 25 deletions
diff --git a/src/test/compile-fail/non-constant-expr-for-fixed-len-vec.rs b/src/test/compile-fail/non-constant-expr-for-fixed-len-vec.rs index 3ecff26f628..2a9a0358cc6 100644 --- a/src/test/compile-fail/non-constant-expr-for-fixed-len-vec.rs +++ b/src/test/compile-fail/non-constant-expr-for-fixed-len-vec.rs @@ -8,10 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-test -// -// Ignored because of an ICE at the moment. - // Check that non-constant exprs do fail as count in fixed length vec type fn main() { diff --git a/src/test/run-pass/dead-code-one-arm-if.rs b/src/test/run-pass/dead-code-one-arm-if.rs deleted file mode 100644 index 197032b3315..00000000000 --- a/src/test/run-pass/dead-code-one-arm-if.rs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2012 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 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// ignore-test #12920 - -pub fn main() { if 1 == 1 { return; } println!("Paul is dead"); } diff --git a/src/test/run-pass/parse-fail.rs b/src/test/run-pass/parse-fail.rs index ffab2f295fa..52a857e21e5 100644 --- a/src/test/run-pass/parse-fail.rs +++ b/src/test/run-pass/parse-fail.rs @@ -10,8 +10,6 @@ #![allow(unreachable_code)] -// ignore-test #12920 - fn dont_call_me() { fail!(); println!("{}", 1); } pub fn main() { } diff --git a/src/test/run-pass/trait-inheritance-cast.rs b/src/test/run-pass/trait-inheritance-cast.rs index 4580fb7ab99..51bc2751873 100644 --- a/src/test/run-pass/trait-inheritance-cast.rs +++ b/src/test/run-pass/trait-inheritance-cast.rs @@ -8,16 +8,14 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-test // Testing that supertrait methods can be called on subtrait object types -// It's not clear yet that we want this trait Foo { - fn f() -> int; + fn f(&self) -> int; } trait Bar : Foo { - fn g() -> int; + fn g(&self) -> int; } struct A { @@ -25,11 +23,11 @@ struct A { } impl Foo for A { - fn f() -> int { 10 } + fn f(&self) -> int { 10 } } impl Bar for A { - fn g() -> int { 20 } + fn g(&self) -> int { 20 } } pub fn main() { |
