diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2021-02-21 14:21:04 +0100 |
|---|---|---|
| committer | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2021-02-21 14:21:04 +0100 |
| commit | 50b39b2b65be6f0d3eca29c24abccc8bafffcea5 (patch) | |
| tree | 792c00327ba1cd6869a03165b0046207ace2c896 /src/tools/compiletest | |
| parent | e7c23ab933ebc1f205c3b59f4ebc85d40f67d404 (diff) | |
| download | rust-50b39b2b65be6f0d3eca29c24abccc8bafffcea5.tar.gz rust-50b39b2b65be6f0d3eca29c24abccc8bafffcea5.zip | |
Add new rustdoc-gui test suite
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/common.rs | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/main.rs | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs index cde4bfe288d..99cbcf316a2 100644 --- a/src/tools/compiletest/src/common.rs +++ b/src/tools/compiletest/src/common.rs @@ -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)] diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs index 3fde24e8a7f..5f263ea87db 100644 --- a/src/tools/compiletest/src/main.rs +++ b/src/tools/compiletest/src/main.rs @@ -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"), } } diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 1ec32184d98..61b21bce10b 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -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 |