development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-10-02 05:53:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get make test working on MSVC

Browse source 
This commit updates Cargo's unit tests to pass `make check` entirely on MSVC
targets. Two tests are ignored on MSVC as it requires panicking to be
implemented, which currently isn't, but otherwise Cargo is fully functional.
This commit is contained in:
Alex Crichton 2015-06-26 15:51:53 -07:00
parent 0b6db0a055
commit f97579a2c9
5 changed files with 21 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/test_cargo_bench.rs
View file

@ -154,6 +154,7 @@ test!(many_similar_names {
test!(cargo_bench_failing_test {
if !::is_nightly() { return }
if !::can_panic() { return }
let p = project("foo")
.file("Cargo.toml", &basic_bin_manifest("foo"))

41
tests/test_cargo_compile.rs
View file

@ -722,24 +722,12 @@ test!(many_crate_types_old_style_lib_location {
.file("src/foo.rs", r#"
pub fn foo() {}
"#);
assert_that(p.cargo_process("build"),
execs().with_status(0));
assert_that(p.cargo_process("build"), execs().with_status(0));
let files = fs::read_dir(&p.root().join("target/debug")).unwrap();
let mut files: Vec<String> = files.map(|e| e.unwrap().path()).filter_map(|f| {
match f.file_name().unwrap().to_str().unwrap() {
"build" | "examples" | "deps" => None,
s if s.contains("fingerprint") || s.contains("dSYM") => None,
s => Some(s.to_string())
}
}).collect();
files.sort();
let file0 = &files[0];
let file1 = &files[1];
println!("{} {}", file0, file1);
assert!(file0.ends_with(".rlib") || file1.ends_with(".rlib"));
assert!(file0.ends_with(env::consts::DLL_SUFFIX) ||
file1.ends_with(env::consts::DLL_SUFFIX));
assert_that(&p.root().join("target/debug/libfoo.rlib"), existing_file());
let fname = format!("{}foo{}", env::consts::DLL_PREFIX,
env::consts::DLL_SUFFIX);
assert_that(&p.root().join("target/debug").join(&fname), existing_file());
});
test!(many_crate_types_correct {
@ -763,21 +751,10 @@ test!(many_crate_types_correct {
assert_that(p.cargo_process("build"),
execs().with_status(0));
let files = fs::read_dir(&p.root().join("target/debug")).unwrap();
let mut files: Vec<String> = files.map(|f| f.unwrap().path()).filter_map(|f| {
match f.file_name().unwrap().to_str().unwrap() {
"build" | "examples" | "deps" => None,
s if s.contains("fingerprint") || s.contains("dSYM") => None,
s => Some(s.to_string())
}
}).collect();
files.sort();
let file0 = &files[0];
let file1 = &files[1];
println!("{} {}", file0, file1);
assert!(file0.ends_with(".rlib") || file1.ends_with(".rlib"));
assert!(file0.ends_with(env::consts::DLL_SUFFIX) ||
file1.ends_with(env::consts::DLL_SUFFIX));
assert_that(&p.root().join("target/debug/libfoo.rlib"), existing_file());
let fname = format!("{}foo{}", env::consts::DLL_PREFIX,
env::consts::DLL_SUFFIX);
assert_that(&p.root().join("target/debug").join(&fname), existing_file());
});
test!(unused_keys {

4
tests/test_cargo_compile_plugins.rs
View file

@ -218,7 +218,9 @@ test!(doctest_a_plugin {
name = "bar"
plugin = true
"#)
.file("bar/src/lib.rs", "");
.file("bar/src/lib.rs", r#"
pub fn bar() {}
"#);
assert_that(p.cargo_process("test").arg("-v"),
execs().with_status(0));

4
tests/test_cargo_test.rs
View file

@ -164,6 +164,8 @@ test!(many_similar_names {
});
test!(cargo_test_failing_test {
if !::can_panic() { return }
let p = project("foo")
.file("Cargo.toml", &basic_bin_manifest("foo"))
.file("src/foo.rs", r#"
@ -690,7 +692,7 @@ test!(bin_there_for_integration {
authors = []
"#)
.file("src/main.rs", "
fn main() { panic!(); }
fn main() { std::process::exit(101); }
#[test] fn main_test() {}
")
.file("tests/foo.rs", r#"

5
tests/tests.rs
View file

@ -65,3 +65,8 @@ fn is_nightly() -> bool {
let version_info = cargo::ops::rustc_version("rustc").unwrap().0;
version_info.contains("-nightly") || version_info.contains("-dev")
}
fn can_panic() -> bool {
let host = cargo::ops::rustc_version("rustc").unwrap().1;
!host.contains("msvc")
}