Auto merge of #7534 - ehuss:fix-windows-nightly, r=alexcrichton

Fix some tests failing on Windows nightly. - Windows MSVC binaries don't have metadata hash anymore. - Properly escape backslashes in config TOML.
rust-lang · Oct 24, 2019 · dcad4cc · dcad4cc
2 parents 79bb06b + 3beb139
commit dcad4cc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/tests/testsuite/dep_info.rs b/tests/testsuite/dep_info.rs
@@ -275,7 +275,7 @@ fn relative_depinfo_paths_ws() {
 
     assert_deps_contains(
         &p,
-        &format!("target/{}/debug/.fingerprint/foo-*/dep-bin-foo-*", host),
+        &format!("target/{}/debug/.fingerprint/foo-*/dep-bin-foo*", host),
         &[
             (1, "src/main.rs"),
             (
@@ -403,7 +403,7 @@ fn relative_depinfo_paths_no_ws() {
 
     assert_deps_contains(
         &p,
-        "target/debug/.fingerprint/foo-*/dep-bin-foo-*",
+        "target/debug/.fingerprint/foo-*/dep-bin-foo*",
         &[
             (1, "src/main.rs"),
             (

diff --git a/tests/testsuite/test.rs b/tests/testsuite/test.rs
@@ -1,15 +1,12 @@
-use std::fs::{self, File};
-use std::io::prelude::*;
-
 use cargo;
-
 use cargo_test_support::paths::CargoPathExt;
 use cargo_test_support::registry::Package;
 use cargo_test_support::{
     basic_bin_manifest, basic_lib_manifest, basic_manifest, cargo_exe, project,
 };
 use cargo_test_support::{cross_compile, is_nightly, paths};
 use cargo_test_support::{rustc_host, sleep_ms};
+use std::fs;
 
 #[cargo_test]
 fn cargo_test_simple() {
@@ -2421,10 +2418,7 @@ fn bin_does_not_rebuild_tests() {
     p.cargo("test -v").run();
 
     sleep_ms(1000);
-    File::create(&p.root().join("src/main.rs"))
-        .unwrap()
-        .write_all(b"fn main() { 3; }")
-        .unwrap();
+    fs::write(p.root().join("src/main.rs"), "fn main() { 3; }").unwrap();
 
     p.cargo("test -v --no-run")
         .with_stderr(
@@ -3787,19 +3781,19 @@ fn cargo_test_doctest_xcompile_runner() {
     let config = paths::root().join(".cargo/config");
 
     fs::create_dir_all(config.parent().unwrap()).unwrap();
-    File::create(config)
-        .unwrap()
-        .write_all(
-            format!(
-                r#"
+    // Escape Windows backslashes for TOML config.
+    let runner_str = runner_path.to_str().unwrap().replace('\\', "\\\\");
+    fs::write(
+        config,
+        format!(
+            r#"
 [target.'cfg(target_arch = "x86")']
 runner = "{}"
 "#,
-                runner_path.to_str().unwrap()
-            )
-            .as_bytes(),
-        )
-        .unwrap();
+            runner_str
+        ),
+    )
+    .unwrap();
 
     let p = project()
         .file("Cargo.toml", &basic_lib_manifest("foo"))