diff options
| author | Joshua Nelson <jnelson@cloudflare.com> | 2022-07-02 00:54:05 -0500 |
|---|---|---|
| committer | Joshua Nelson <jnelson@cloudflare.com> | 2022-07-02 02:11:49 -0500 |
| commit | 17da4e06f20a47a68fe0a71607a66d7f9a4c850b (patch) | |
| tree | 4b1d695a3e08721d9fc4146e02b2a1ddb69d2ec9 /src/tools/compiletest | |
| parent | acdcdfb61b7b472bfacbb8bb889bdf3204827f2e (diff) | |
| download | rust-17da4e06f20a47a68fe0a71607a66d7f9a4c850b.tar.gz rust-17da4e06f20a47a68fe0a71607a66d7f9a4c850b.zip | |
Fix bug in `rustdoc -Whelp`
Previously, this printed the debugging options, not the lint options, and only handled `-Whelp`, not `-A/-D/-F`. This also fixes a few other misc issues: - Fix `// check-stdout` for UI tests; previously it only worked for run-fail and compile-fail tests - Add lint headers for tool lints, not just builtin lints - Remove duplicate run-make test
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 160b9785d97..075d75a1d6c 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -3245,7 +3245,8 @@ impl<'test> TestCx<'test> { if !self.props.error_patterns.is_empty() { // "// error-pattern" comments - self.check_error_patterns(&proc_res.stderr, &proc_res, pm); + let output_to_check = self.get_output(&proc_res); + self.check_error_patterns(&output_to_check, &proc_res, pm); } } @@ -3266,7 +3267,8 @@ impl<'test> TestCx<'test> { if check_patterns { // "// error-pattern" comments - self.check_error_patterns(&proc_res.stderr, &proc_res, pm); + let output_to_check = self.get_output(&proc_res); + self.check_error_patterns(&output_to_check, &proc_res, pm); } if check_annotations { |
