diff options
| author | Oliver Middleton <olliemail27@gmail.com> | 2020-02-15 23:14:46 +0000 |
|---|---|---|
| committer | Oliver Middleton <olliemail27@gmail.com> | 2020-02-15 23:14:46 +0000 |
| commit | 3300725342dba6b191bfcc094485f708695c8a44 (patch) | |
| tree | 7cf0173c81563ea106df599ac7b667671c48d3f5 /src | |
| parent | e168dcd254d0a6a0cbaad5f2c054ce5116a07119 (diff) | |
| download | rust-3300725342dba6b191bfcc094485f708695c8a44.tar.gz rust-3300725342dba6b191bfcc094485f708695c8a44.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/test.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 1580091488f..899c44bbdd2 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -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 { @@ -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, }) } @@ -843,7 +843,7 @@ macro_rules! test_definitions { 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 @@ 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" { |
