Skip to content

Commit 7d6b8c4

Browse files
committed
Auto merge of #69198 - ollie27:rustbuild_rustdoc-js, r=Mark-Simulacrum
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.
2 parents 7710ae0 + 3300725 commit 7d6b8c4

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/bootstrap/test.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ impl Step for RustdocJSNotStd {
662662
target: self.target,
663663
mode: "js-doc-test",
664664
suite: "rustdoc-js",
665-
path: None,
665+
path: "src/test/rustdoc-js",
666666
compare_mode: None,
667667
});
668668
} else {
@@ -698,7 +698,7 @@ impl Step for RustdocUi {
698698
target: self.target,
699699
mode: "ui",
700700
suite: "rustdoc-ui",
701-
path: Some("src/test/rustdoc-ui"),
701+
path: "src/test/rustdoc-ui",
702702
compare_mode: None,
703703
})
704704
}
@@ -843,7 +843,7 @@ macro_rules! test_definitions {
843843
target: self.target,
844844
mode: $mode,
845845
suite: $suite,
846-
path: Some($path),
846+
path: $path,
847847
compare_mode: $compare_mode,
848848
})
849849
}
@@ -926,7 +926,7 @@ struct Compiletest {
926926
target: Interned<String>,
927927
mode: &'static str,
928928
suite: &'static str,
929-
path: Option<&'static str>,
929+
path: &'static str,
930930
compare_mode: Option<&'static str>,
931931
}
932932

@@ -949,7 +949,7 @@ impl Step for Compiletest {
949949
let suite = self.suite;
950950

951951
// Path for test suite
952-
let suite_path = self.path.unwrap_or("");
952+
let suite_path = self.path;
953953

954954
// Skip codegen tests if they aren't enabled in configuration.
955955
if !builder.config.codegen_tests && suite == "codegen" {

0 commit comments

Comments
 (0)