diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-04-04 01:49:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-04 01:49:13 +0200 |
| commit | 231bd482c6d2f2aae463f2d5b57ed3c8f5a0803e (patch) | |
| tree | d8484f16a7f4568dc6086d133859d1070f3a0b43 /src | |
| parent | eb3215e523d41420b4b73add98541f9f26f26eb1 (diff) | |
| parent | da99f4671150ba90a5441e012d3f1f5b87536f3b (diff) | |
| download | rust-231bd482c6d2f2aae463f2d5b57ed3c8f5a0803e.tar.gz rust-231bd482c6d2f2aae463f2d5b57ed3c8f5a0803e.zip | |
Rollup merge of #59677 - phansch:rustfix_coverage_handle_other_error_formats, r=oli-obk
rustfix coverage: Skip UI tests with non-json error-format When using the `rustfix-coverage` flag, some tests currently fail because they define a different error-format than `json`. The current implementation crashes when encountering those tests. Since we don't care about non-json test output when collecting the coverage data, we handle those tests by returning an empty `Vec` instead. r? @oli-obk
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 35f8dca79b5..2021dd513aa 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -2820,12 +2820,15 @@ impl<'test> TestCx<'test> { // don't test rustfix with nll right now } else if self.config.rustfix_coverage { // Find out which tests have `MachineApplicable` suggestions but are missing - // `run-rustfix` or `run-rustfix-only-machine-applicable` headers + // `run-rustfix` or `run-rustfix-only-machine-applicable` headers. + // + // This will return an empty `Vec` in case the executed test file has a + // `compile-flags: --error-format=xxxx` header with a value other than `json`. let suggestions = get_suggestions_from_json( &proc_res.stderr, &HashSet::new(), Filter::MachineApplicableOnly - ).unwrap(); + ).unwrap_or_default(); if suggestions.len() > 0 && !self.props.run_rustfix && !self.props.rustfix_only_machine_applicable { |