diff options
| author | bors <bors@rust-lang.org> | 2017-05-01 22:36:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-01 22:36:44 +0000 |
| commit | de4bdd20f87d95d164c883dc141a2763e4df155a (patch) | |
| tree | 59fd839a260c2b419b09d37ceabb42bc382066e3 | |
| parent | 777ee20796e80a31d4b7c985dd68eda2941460d6 (diff) | |
| parent | f48a8f592d264c04bb502a79cbd5ef28e82372a3 (diff) | |
| download | rust-de4bdd20f87d95d164c883dc141a2763e4df155a.tar.gz rust-de4bdd20f87d95d164c883dc141a2763e4df155a.zip | |
Auto merge of #41629 - Mark-Simulacrum:re-enable-tests, r=nikomatsakis
Unignore tests which work fine now. As far as I can tell, these tests will now work fine. #13745 tracks the remaining tests which are ignored for various reasons.
5 files changed, 5 insertions, 7 deletions
diff --git a/src/test/compile-fail/const-eval-overflow-4.rs b/src/test/compile-fail/const-eval-overflow-4.rs index 67525fc1626..06b7d0206b1 100644 --- a/src/test/compile-fail/const-eval-overflow-4.rs +++ b/src/test/compile-fail/const-eval-overflow-4.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-test this should fail to compile (#23833) - // Evaluation of constants in array-elem count goes through different // compiler control-flow paths. // @@ -23,7 +21,8 @@ use std::{u8, u16, u32, u64, usize}; const A_I8_T : [u32; (i8::MAX as i8 + 1i8) as usize] - //~^ ERROR error evaluating count: attempt to add with overflow + //~^ ERROR constant evaluation error + //~^^ NOTE attempt to add with overflow = [0; (i8::MAX as usize) + 1]; fn main() { diff --git a/src/test/compile-fail/directory_ownership/macro_expanded_mod_helper/foo/bar.rs b/src/test/compile-fail/directory_ownership/macro_expanded_mod_helper/foo/bar.rs index 3ec34362da5..9177dcba0d7 100644 --- a/src/test/compile-fail/directory_ownership/macro_expanded_mod_helper/foo/bar.rs +++ b/src/test/compile-fail/directory_ownership/macro_expanded_mod_helper/foo/bar.rs @@ -8,4 +8,4 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-test +// ignore-test not a test, auxillary diff --git a/src/test/compile-fail/directory_ownership/macro_expanded_mod_helper/foo/mod.rs b/src/test/compile-fail/directory_ownership/macro_expanded_mod_helper/foo/mod.rs index 25fcf11ce17..e29c985b983 100644 --- a/src/test/compile-fail/directory_ownership/macro_expanded_mod_helper/foo/mod.rs +++ b/src/test/compile-fail/directory_ownership/macro_expanded_mod_helper/foo/mod.rs @@ -8,6 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-test +// ignore-test not a test, auxillary mod_decl!(bar); diff --git a/src/test/run-fail/call-fn-never-arg.rs b/src/test/run-fail/call-fn-never-arg.rs index b1aa76cd9bf..95101e70db9 100644 --- a/src/test/run-fail/call-fn-never-arg.rs +++ b/src/test/run-fail/call-fn-never-arg.rs @@ -10,7 +10,6 @@ // Test that we can use a ! for an argument of type ! -// ignore-test FIXME(durka) can't be done with the current liveness code // error-pattern:wowzers! #![feature(never_type)] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-reexport.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-reexport.rs index fae2d27ab6b..24865ea2709 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-reexport.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-reexport.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-test +// ignore-test not a test, auxillary #![feature(macro_reexport)] |