From: Peter Williams <peter@newton.cx>
Date: Tue, 7 Feb 2017 20:55:36 +0000 (-0500)
Subject: Attempt to fix the run_with_library_paths test for Windows.
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~9^2~165^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d545a9fe627f63b03aac3298be8f3cb85fa3060d;p=cargo.git

Attempt to fix the run_with_library_paths test for Windows.

I was just pasting the build directories into Rust string literals, so Windows
paths with backslashes were being interpreted as having unknown string
escapes. Raw string guards should fix this for all but the most pathological
of build directories.
---

diff --git a/tests/run.rs b/tests/run.rs
index 8caa3c7e7..36d2b5a28 100644
--- a/tests/run.rs
+++ b/tests/run.rs
@@ -602,7 +602,7 @@ fn run_with_library_paths() {
     // Only link search directories within the target output directory are
     // propagated through to dylib_path_envvar() (see #3366).
     let mut dir1 = p.target_debug_dir();
-    dir1.push("foo");
+    dir1.push("foo\\backslash");
 
     let mut dir2 = p.target_debug_dir();
     dir2.push("dir=containing=equal=signs");
@@ -614,20 +614,20 @@ fn run_with_library_paths() {
             authors = []
             build = "build.rs"
         "#)
-        .file("build.rs", &format!(r#"
+        .file("build.rs", &format!(r##"
             fn main() {{
-                println!("cargo:rustc-link-search=native={}");
-                println!("cargo:rustc-link-search={}");
+                println!(r#"cargo:rustc-link-search=native={}"#);
+                println!(r#"cargo:rustc-link-search={}"#);
             }}
-        "#, dir1.display(), dir2.display()))
-        .file("src/main.rs", &format!(r#"
+        "##, dir1.display(), dir2.display()))
+        .file("src/main.rs", &format!(r##"
             fn main() {{
                 let search_path = std::env::var_os("{}").unwrap();
                 let paths = std::env::split_paths(&search_path).collect::<Vec<_>>();
-                assert!(paths.contains(&"{}".into()));
-                assert!(paths.contains(&"{}".into()));
+                assert!(paths.contains(&r#"{}"#.into()));
+                assert!(paths.contains(&r#"{}"#.into()));
             }}
-        "#, dylib_path_envvar(), dir1.display(), dir2.display()));
+        "##, dylib_path_envvar(), dir1.display(), dir2.display()));
 
     assert_that(p.cargo_process("run"), execs().with_status(0));
 }