diff --git a/src/doc/guide-testing.md b/src/doc/guide-testing.md index 1d6513972a6d2..7bfa4d0ef5ad2 100644 --- a/src/doc/guide-testing.md +++ b/src/doc/guide-testing.md @@ -72,8 +72,8 @@ is not used. Tests that should not be run can be annotated with the `ignore` attribute. The existence of these tests will be noted in the test runner output, but the test will not be run. Tests can also be ignored -by configuration so, for example, to ignore a test on windows you can -write `#[ignore(cfg(target_os = "win32"))]`. +by configuration using the `cfg_attr` attribute so, for example, to ignore a +test on windows you can write `#[cfg_attr(windows, ignore)]`. Tests that are intended to fail can be annotated with the `should_fail` attribute. The test will be run, and if it causes its diff --git a/src/libnative/io/file_unix.rs b/src/libnative/io/file_unix.rs index ddcff2be5f340..aded021cdcfe7 100644 --- a/src/libnative/io/file_unix.rs +++ b/src/libnative/io/file_unix.rs @@ -520,7 +520,7 @@ mod tests { use std::os; use std::rt::rtio::{RtioFileStream, SeekSet}; - #[ignore(cfg(target_os = "freebsd"))] // hmm, maybe pipes have a tiny buffer + #[cfg_attr(target_os = "freebsd", ignore)] // hmm, maybe pipes have a tiny buffer #[test] fn test_file_desc() { // Run this test with some pipes so we don't have to mess around with diff --git a/src/libnum/complex.rs b/src/libnum/complex.rs index f4a3ac97a4ef7..3340512edd2af 100644 --- a/src/libnum/complex.rs +++ b/src/libnum/complex.rs @@ -220,7 +220,7 @@ mod test { } #[test] - #[ignore(cfg(target_arch = "x86"))] + #[cfg_attr(target_arch = "x86", ignore)] // FIXME #7158: (maybe?) currently failing on x86. fn test_norm() { fn test(c: Complex64, ns: f64) { diff --git a/src/librustc/front/test.rs b/src/librustc/front/test.rs index 0fce75c8369bc..696ae1c1d761c 100644 --- a/src/librustc/front/test.rs +++ b/src/librustc/front/test.rs @@ -303,6 +303,12 @@ fn is_ignored(cx: &TestCtxt, i: Gc) -> bool { // check ignore(cfg(foo, bar)) attr.check_name("ignore") && match attr.meta_item_list() { Some(ref cfgs) => { + if cfgs.iter().any(|cfg| cfg.check_name("cfg")) { + cx.sess.span_warn(attr.span, + "The use of cfg filters in #[ignore] is \ + deprecated. Use #[cfg_attr(, \ + ignore)] instead."); + } attr::test_cfg(cx.config.as_slice(), cfgs.iter().map(|x| *x)) } None => true diff --git a/src/librustuv/net.rs b/src/librustuv/net.rs index 3cc10ae3823ac..41b90f81969ef 100644 --- a/src/librustuv/net.rs +++ b/src/librustuv/net.rs @@ -1049,7 +1049,7 @@ mod test { } #[test] - #[ignore(cfg(windows))] // FIXME(#10102) server never sees second packet + #[cfg_attr(windows, ignore)] // FIXME(#10102) server never sees second packet fn test_udp_twice() { let server_addr = ::next_test_ip4(); let client_addr = ::next_test_ip4(); diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index 58d69e38cc6e0..cee9507ddea8e 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -3005,7 +3005,7 @@ mod tests { } } #[test] - #[ignore(cfg(target_word_size = "32"))] // FIXME(#14064) + #[cfg_attr(target_word_size = "32", ignore)] // FIXME(#14064) fn test_streaming_parser() { assert_stream_equal( r#"{ "foo":"bar", "array" : [0, 1, 2,3 ,4,5], "idents":[null,true,false]}"#, @@ -3040,7 +3040,7 @@ mod tests { } } #[test] - #[ignore(cfg(target_word_size = "32"))] // FIXME(#14064) + #[cfg_attr(target_word_size = "32", ignore)] // FIXME(#14064) fn test_read_object_streaming() { assert_eq!(last_event("{ "), Error(SyntaxError(EOFWhileParsingObject, 1, 3))); assert_eq!(last_event("{1"), Error(SyntaxError(KeyMustBeAString, 1, 2))); @@ -3112,7 +3112,7 @@ mod tests { ); } #[test] - #[ignore(cfg(target_word_size = "32"))] // FIXME(#14064) + #[cfg_attr(target_word_size = "32", ignore)] // FIXME(#14064) fn test_read_list_streaming() { assert_stream_equal( "[]", diff --git a/src/libstd/dynamic_lib.rs b/src/libstd/dynamic_lib.rs index 2c4e0ea67010f..d8c757b3b9c84 100644 --- a/src/libstd/dynamic_lib.rs +++ b/src/libstd/dynamic_lib.rs @@ -162,8 +162,7 @@ mod test { use mem; #[test] - #[ignore(cfg(windows))] // FIXME #8818 - #[ignore(cfg(target_os="android"))] // FIXME(#10379) + #[cfg_attr(any(windows, target_os = "android"), ignore)] // FIXME #8818, #10379 fn test_loading_cosine() { // The math library does not need to be loaded since it is already // statically linked in diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs index 0b0c22ed88799..0bead0a583256 100644 --- a/src/libstd/io/net/tcp.rs +++ b/src/libstd/io/net/tcp.rs @@ -457,7 +457,7 @@ mod test { Ok(..) => fail!(), Err(e) => assert_eq!(e.kind, PermissionDenied), } - } #[ignore(cfg(windows))] #[ignore(cfg(target_os = "android"))]) + } #[cfg_attr(any(windows, target_os = "android"), ignore)]) iotest!(fn connect_error() { match TcpStream::connect("0.0.0.0", 1) { diff --git a/src/libstd/io/net/udp.rs b/src/libstd/io/net/udp.rs index 5f7563e7467ba..ea9916677deb7 100644 --- a/src/libstd/io/net/udp.rs +++ b/src/libstd/io/net/udp.rs @@ -273,7 +273,7 @@ mod test { Ok(..) => fail!(), Err(e) => assert_eq!(e.kind, PermissionDenied), } - } #[ignore(cfg(windows))] #[ignore(cfg(target_os = "android"))]) + } #[cfg_attr(any(windows, target_os = "android"), ignore)]) iotest!(fn socket_smoke_test_ip4() { let server_ip = next_test_ip4(); diff --git a/src/libstd/io/net/unix.rs b/src/libstd/io/net/unix.rs index 5e7c421497772..6a9bf9290dd7f 100644 --- a/src/libstd/io/net/unix.rs +++ b/src/libstd/io/net/unix.rs @@ -288,7 +288,7 @@ mod tests { }, proc(_client) { // drop the client }) - } #[ignore(cfg(windows))]) // FIXME(#12516) + } #[cfg_attr(windows, ignore)]) // FIXME(#12516) iotest!(fn write_begone() { smalltest(proc(mut server) { diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs index 680620f5a752f..3ddc9c671be28 100644 --- a/src/libstd/num/f32.rs +++ b/src/libstd/num/f32.rs @@ -767,7 +767,7 @@ mod tests { assert_eq!((-0f32).frexp(), (-0f32, 0)); } - #[test] #[ignore(cfg(windows))] // FIXME #8755 + #[test] #[cfg_attr(windows, ignore)] // FIXME #8755 fn test_frexp_nowin() { let inf: f32 = Float::infinity(); let neg_inf: f32 = Float::neg_infinity(); diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs index 3180ee28c6fee..8c1a8bfe4155f 100644 --- a/src/libstd/num/f64.rs +++ b/src/libstd/num/f64.rs @@ -769,7 +769,7 @@ mod tests { assert_eq!((-0f64).frexp(), (-0f64, 0)); } - #[test] #[ignore(cfg(windows))] // FIXME #8755 + #[test] #[cfg_attr(windows, ignore)] // FIXME #8755 fn test_frexp_nowin() { let inf: f64 = Float::infinity(); let neg_inf: f64 = Float::neg_infinity(); diff --git a/src/libsync/deque.rs b/src/libsync/deque.rs index c541cc02774e0..4b23e8a9345b9 100644 --- a/src/libsync/deque.rs +++ b/src/libsync/deque.rs @@ -600,7 +600,7 @@ mod tests { } #[test] - #[ignore(cfg(windows))] // apparently windows scheduling is weird? + #[cfg_attr(windows, ignore)] // apparently windows scheduling is weird? fn no_starvation() { static AMT: int = 10000; static NTHREADS: int = 4; diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index d00406e07b77d..8e158442d3331 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -419,6 +419,8 @@ fn initial_syntax_expander_table() -> SyntaxEnv { syntax_expanders.insert(intern("cfg"), builtin_normal_expander( ext::cfg::expand_cfg)); + syntax_expanders.insert(intern("cfg_attr"), + ItemModifier(ext::cfg_attr::expand)); syntax_expanders.insert(intern("trace_macros"), builtin_normal_expander( ext::trace_macros::expand_trace_macros)); diff --git a/src/libsyntax/ext/cfg_attr.rs b/src/libsyntax/ext/cfg_attr.rs new file mode 100644 index 0000000000000..0c359ff90bb0a --- /dev/null +++ b/src/libsyntax/ext/cfg_attr.rs @@ -0,0 +1,58 @@ +// 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. + +use std::gc::{Gc, GC}; + +use ast; +use attr; +use codemap::Span; +use ext::base::ExtCtxt; +use ext::build::AstBuilder; + +pub fn expand(cx: &mut ExtCtxt, sp: Span, mi: Gc, it: Gc) + -> Gc { + let (cfg, attr) = match mi.node { + ast::MetaList(_, ref mis) if mis.len() == 2 => (mis[0], mis[1]), + _ => { + cx.span_err(sp, "expected `#[cfg_attr(, )]`"); + return it; + } + }; + + if cfg_matches(cx, cfg) { + let mut out = (*it).clone(); + out.attrs.push(cx.attribute(attr.span, attr)); + box(GC) out + } else { + it + } +} + +fn cfg_matches(cx: &mut ExtCtxt, cfg: Gc) -> bool { + match cfg.node { + ast::MetaList(ref pred, ref mis) => { + match pred.get() { + "any" => mis.iter().any(|mi| cfg_matches(cx, *mi)), + "all" => mis.iter().all(|mi| cfg_matches(cx, *mi)), + "not" if mis.len() == 1 => !cfg_matches(cx, mis[0]), + "not" => { + cx.span_err(cfg.span, + format!("expected 1 value, got {}", mis.len()).as_slice()); + false + } + _ => { + cx.span_err(cfg.span, format!("invalid predicate `{}`", pred).as_slice()); + false + } + } + } + ast::MetaWord(_) | ast::MetaNameValue(..) => attr::contains(cx.cfg.as_slice(), cfg), + } +} diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 13d2a632f3638..dd58189be715c 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -76,6 +76,7 @@ pub mod ext { pub mod build; pub mod bytes; pub mod cfg; + pub mod cfg_attr; pub mod concat; pub mod concat_idents; pub mod deriving; diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 46e2ca03ef6ed..1db72bcb39029 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -355,8 +355,7 @@ Test Attributes: #[ignore] - When applied to a function which is already attributed as a test, then the test runner will ignore these tests during normal test runs. Running with --ignored will run these - tests. This may also be written as #[ignore(cfg(...))] to - ignore the test on certain configurations.", + tests.", usage = getopts::usage(message.as_slice(), optgroups().as_slice())); } diff --git a/src/libtime/lib.rs b/src/libtime/lib.rs index 56a22bb2addeb..d1197809e6288 100644 --- a/src/libtime/lib.rs +++ b/src/libtime/lib.rs @@ -1490,7 +1490,7 @@ mod tests { } #[test] - #[ignore(cfg(target_os = "android"))] // FIXME #10958 + #[cfg_attr(target_os = "android", ignore)] // FIXME #10958 fn run_tests() { // The tests race on tzset. So instead of having many independent // tests, we will just call the functions now. diff --git a/src/test/run-pass/cfg_attr.rs b/src/test/run-pass/cfg_attr.rs new file mode 100644 index 0000000000000..15d3f4a04d57a --- /dev/null +++ b/src/test/run-pass/cfg_attr.rs @@ -0,0 +1,59 @@ +// 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. + +// compile-flags:--cfg set1 --cfg set2 +#![allow(dead_code)] +use std::fmt::Show; + +struct NotShowable; + +#[cfg_attr(set1, deriving(Show))] +struct Set1; + +#[cfg_attr(notset, deriving(Show))] +struct Notset(NotShowable); + +#[cfg_attr(not(notset), deriving(Show))] +struct NotNotset; + +#[cfg_attr(not(set1), deriving(Show))] +struct NotSet1(NotShowable); + +#[cfg_attr(all(set1, set2), deriving(Show))] +struct AllSet1Set2; + +#[cfg_attr(all(set1, notset), deriving(Show))] +struct AllSet1Notset(NotShowable); + +#[cfg_attr(any(set1, notset), deriving(Show))] +struct AnySet1Notset; + +#[cfg_attr(any(notset, notset2), deriving(Show))] +struct AnyNotsetNotset2(NotShowable); + +#[cfg_attr(all(not(notset), any(set1, notset)), deriving(Show))] +struct Complex; + +#[cfg_attr(any(notset, not(any(set1, notset))), deriving(Show))] +struct ComplexNot(NotShowable); + +#[cfg_attr(any(target_endian = "little", target_endian = "big"), deriving(Show))] +struct KeyValue; + +fn is_show() {} + +fn main() { + is_show::(); + is_show::(); + is_show::(); + is_show::(); + is_show::(); + is_show::(); +} diff --git a/src/test/run-pass/tcp-connect-timeouts.rs b/src/test/run-pass/tcp-connect-timeouts.rs index d2408509fc582..0b04628f0cc2f 100644 --- a/src/test/run-pass/tcp-connect-timeouts.rs +++ b/src/test/run-pass/tcp-connect-timeouts.rs @@ -78,7 +78,7 @@ iotest!(fn eventual_timeout() { } } fail!("never timed out!"); -} #[ignore(cfg(target_os = "freebsd"))]) +} #[cfg_attr(target_os = "freebsd", ignore)]) iotest!(fn timeout_success() { let addr = next_test_ip4();