move a test into a run make, to check external affect rather than
implementation details. (Mainly to avoid accessing the secret internal test module symbol name.)
This commit is contained in:
parent
3826026f98
commit
c3284733e3
3 changed files with 26 additions and 36 deletions
7
src/test/run-make/test-harness/Makefile
Normal file
7
src/test/run-make/test-harness/Makefile
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
-include ../tools.mk
|
||||||
|
|
||||||
|
all:
|
||||||
|
# check that #[ignore(cfg(...))] does the right thing.
|
||||||
|
$(RUSTC) --test test-ignore-cfg.rs --cfg ignorecfg
|
||||||
|
$(call RUN,test-ignore-cfg) | grep 'shouldnotignore ... ok'
|
||||||
|
$(call RUN,test-ignore-cfg) | grep 'shouldignore ... ignored'
|
19
src/test/run-make/test-harness/test-ignore-cfg.rs
Normal file
19
src/test/run-make/test-harness/test-ignore-cfg.rs
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
// 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 <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.
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore(cfg(ignorecfg))]
|
||||||
|
fn shouldignore() {
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore(cfg(noignorecfg))]
|
||||||
|
fn shouldnotignore() {
|
||||||
|
}
|
|
@ -1,36 +0,0 @@
|
||||||
// Copyright 2012-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 <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.
|
|
||||||
|
|
||||||
// compile-flags: --test --cfg ignorecfg
|
|
||||||
// ignore-pretty: does not work well with `--test`
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
#[ignore(cfg(ignorecfg))]
|
|
||||||
fn shouldignore() {
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
#[ignore(cfg(noignorecfg))]
|
|
||||||
fn shouldnotignore() {
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn checktests() {
|
|
||||||
// Pull the tests out of the secreturn test module
|
|
||||||
let tests = __test::TESTS;
|
|
||||||
|
|
||||||
assert!(
|
|
||||||
tests.iter().any(|t| t.desc.name.to_string().as_slice() == "shouldignore" &&
|
|
||||||
t.desc.ignore));
|
|
||||||
|
|
||||||
assert!(
|
|
||||||
tests.iter().any(|t| t.desc.name.to_string().as_slice() == "shouldnotignore" &&
|
|
||||||
!t.desc.ignore));
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue