Rollup merge of rust-lang#49908 - chrisccoulson:fix-rustdoc-themes-test-without-rpath, r=Mark-Simulacrum

kennytm · kennytm · commit 44a71e2e6125 · 2018-04-14T15:22:39.000+08:00
Fix test failure in src/tools/rustdoc-themes when rust.rpath = false See rust-lang#49907
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
@@ -459,7 +459,7 @@ impl Step for RustdocTheme {
     }
 
     fn run(self, builder: &Builder) {
-        let rustdoc = builder.rustdoc(self.compiler.host);
+        let rustdoc = builder.out.join("bootstrap/debug/rustdoc");
         let mut cmd = builder.tool_cmd(Tool::RustdocTheme);
         cmd.arg(rustdoc.to_str().unwrap())
            .arg(builder.src.join("src/librustdoc/html/static/themes").to_str().unwrap())

Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ impl Step for RustdocTheme {`
`459`	`459`	`}`
`460`	`460`
`461`	`461`	`fn run(self, builder: &Builder) {`
`462`		`- let rustdoc = builder.rustdoc(self.compiler.host);`
	`462`	`+ let rustdoc = builder.out.join("bootstrap/debug/rustdoc");`
`463`	`463`	`let mut cmd = builder.tool_cmd(Tool::RustdocTheme);`
`464`	`464`	`cmd.arg(rustdoc.to_str().unwrap())`
`465`	`465`	`.arg(builder.src.join("src/librustdoc/html/static/themes").to_str().unwrap())`