Skip to content

Commit

Permalink
Fix running rustdoc-js test suite individually
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ollie27 committed Feb 15, 2020
1 parent e168dcd commit 3300725
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/bootstrap/test.rs
Expand Up @@ -662,7 +662,7 @@ impl Step for RustdocJSNotStd {
target: self.target,
mode: "js-doc-test",
suite: "rustdoc-js",
path: None,
path: "src/test/rustdoc-js",
compare_mode: None,
});
} else {
Expand Down Expand Up @@ -698,7 +698,7 @@ impl Step for RustdocUi {
target: self.target,
mode: "ui",
suite: "rustdoc-ui",
path: Some("src/test/rustdoc-ui"),
path: "src/test/rustdoc-ui",
compare_mode: None,
})
}
Expand Down Expand Up @@ -843,7 +843,7 @@ macro_rules! test_definitions {
target: self.target,
mode: $mode,
suite: $suite,
path: Some($path),
path: $path,
compare_mode: $compare_mode,
})
}
Expand Down Expand Up @@ -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>,
}

Expand All @@ -949,7 +949,7 @@ impl Step for Compiletest {
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" {
Expand Down

0 comments on commit 3300725

Please sign in to comment.