user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add new rustdoc-gui test suite

Browse source
This commit is contained in:
Guillaume Gomez 2021-02-21 14:21:04 +01:00
parent e7c23ab933
commit 50b39b2b65
9 changed files with 184 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tools/compiletest/src/common.rs
View file

@ -344,6 +344,8 @@ pub struct Config {
/// Path to a NodeJS executable. Used for JS doctests, emscripten and WASM tests
pub nodejs: Option<String>,
/// Path to a npm executable. Used for rustdoc GUI tests
pub npm: Option<String>,
}
#[derive(Debug, Clone)]

2
src/tools/compiletest/src/main.rs
View file

@ -126,6 +126,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
.reqopt("", "llvm-components", "list of LLVM components built in", "LIST")
.optopt("", "llvm-bin-dir", "Path to LLVM's `bin` directory", "PATH")
.optopt("", "nodejs", "the name of nodejs", "PATH")
.optopt("", "npm", "the name of npm", "PATH")
.optopt("", "remote-test-client", "path to the remote test client", "PATH")
.optopt(
"",
@ -264,6 +265,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
linker: matches.opt_str("linker"),
llvm_components: matches.opt_str("llvm-components").unwrap(),
nodejs: matches.opt_str("nodejs"),
npm: matches.opt_str("npm"),
}
}

2
src/tools/compiletest/src/runtest.rs
View file

@ -1585,7 +1585,7 @@ impl<'test> TestCx<'test> {
let aux_dir = self.aux_output_dir_name();
let rustdoc_path = self.config.rustdoc_path.as_ref().expect("--rustdoc-path passed");
let rustdoc_path = self.config.rustdoc_path.as_ref().expect("--rustdoc-path not passed");
let mut rustdoc = Command::new(rustdoc_path);
rustdoc