Use std::env::EXE_SUFFIX in new tests

rust-lang · Sep 30, 2015 · d9615d7 · d9615d7
1 parent f0647ea
commit d9615d7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/tests/test_cargo_clean.rs b/tests/test_cargo_clean.rs
@@ -1,3 +1,5 @@
+use std::env;
+
 use support::{project, execs, main_file, basic_bin_manifest};
 use hamcrest::{assert_that, existing_dir, existing_file, is_not};
 
@@ -74,16 +76,20 @@ test!(clean_multiple_packages {
                                         .arg("-p").arg("foo"),
                 execs().with_status(0));
 
+    let d1_path = &p.build_dir().join("debug").join("deps")
+                                .join(format!("d1{}", env::consts::EXE_SUFFIX));
+    let d2_path = &p.build_dir().join("debug").join("deps")
+                                .join(format!("d2{}", env::consts::EXE_SUFFIX));
+
+
     assert_that(&p.bin("foo"), existing_file());
-    assert_that(&p.build_dir().join("debug").join("deps").join("d1"), existing_file());
-    assert_that(&p.build_dir().join("debug").join("deps").join("d2"), existing_file());
+    assert_that(d1_path, existing_file());
+    assert_that(d2_path, existing_file());
 
     assert_that(p.cargo("clean").arg("-p").arg("d1").arg("-p").arg("d2")
                                 .cwd(&p.root().join("src")),
                 execs().with_status(0).with_stdout(""));
     assert_that(&p.bin("foo"), existing_file());
-    assert_that(&p.build_dir().join("debug").join("deps").join("d1"),
-                is_not(existing_file()));
-    assert_that(&p.build_dir().join("debug").join("deps").join("d2"),
-                is_not(existing_file()));
+    assert_that(d1_path, is_not(existing_file()));
+    assert_that(d2_path, is_not(existing_file()));
 });
diff --git a/tests/test_cargo_compile.rs b/tests/test_cargo_compile.rs
@@ -1975,12 +1975,16 @@ test!(build_multiple_packages {
     assert_that(process(&p.bin("foo")).unwrap(),
                 execs().with_stdout("i am foo\n"));
 
-    assert_that(&p.build_dir().join("debug").join("deps").join("d1"), existing_file());
-    assert_that(process(&p.build_dir().join("debug").join("deps").join("d1")).unwrap(),
-                execs().with_stdout("d1"));
+    let d1_path = &p.build_dir().join("debug").join("deps")
+                                .join(format!("d1{}", env::consts::EXE_SUFFIX));
+    let d2_path = &p.build_dir().join("debug").join("deps")
+                                .join(format!("d2{}", env::consts::EXE_SUFFIX));
 
-    assert_that(&p.build_dir().join("debug").join("deps").join("d2"), existing_file());
-    assert_that(process(&p.build_dir().join("debug").join("deps").join("d2")).unwrap(),
+    assert_that(d1_path, existing_file());
+    assert_that(process(d1_path).unwrap(), execs().with_stdout("d1"));
+
+    assert_that(d2_path, existing_file());
+    assert_that(process(d2_path).unwrap(),
                 execs().with_stdout("d2"));
 });