mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #69198 - ollie27:rustbuild_rustdoc-js, r=Mark-Simulacrum

Browse Source 
Fix running rustdoc-js test suite individually

Without `Compiletest.path` set running `x.py test src/test/rustdoc-js` would run the `rustdoc-js` test suite with everything filtered out.

As this was the only place setting `Compiletest.path` to `None` this removes the `Option` wrapper as well.
This commit is contained in:
bors 2020-02-19 15:55:57 +00:00
commit 7d6b8c414e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bootstrap/test.rs
View File

@ -662,7 +662,7 @@ fn run(self, builder: &Builder<'_>) {
target: self.target,
mode: "js-doc-test",
suite: "rustdoc-js",
path: None,
path: "src/test/rustdoc-js",
compare_mode: None,
});
} else {
@ -698,7 +698,7 @@ fn run(self, builder: &Builder<'_>) {
target: self.target,
mode: "ui",
suite: "rustdoc-ui",
path: Some("src/test/rustdoc-ui"),
path: "src/test/rustdoc-ui",
compare_mode: None,
})
}
@ -843,7 +843,7 @@ fn run(self, builder: &Builder<'_>) {
target: self.target,
mode: $mode,
suite: $suite,
path: Some($path),
path: $path,
compare_mode: $compare_mode,
})
}
@ -926,7 +926,7 @@ struct Compiletest {
target: Interned<String>,
mode: &'static str,
suite: &'static str,
path: Option<&'static str>,
path: &'static str,
compare_mode: Option<&'static str>,
}
@ -949,7 +949,7 @@ fn run(self, builder: &Builder<'_>) {
let suite = self.suite;
// Path for test suite
let suite_path = self.path.unwrap_or("");
let suite_path = self.path;
// Skip codegen tests if they aren't enabled in configuration.
if !builder.config.codegen_tests && suite == "codegen" {