Skip to content

Commit ec18a34

Browse files
Fixes tests/ui/test-attrs/tests-listing-format-json.rs on Windows
1 parent f217411 commit ec18a34

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/tools/compiletest/src/runtest.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3712,8 +3712,11 @@ impl<'test> TestCx<'test> {
37123712
}
37133713

37143714
fn normalize_output(&self, output: &str, custom_rules: &[(String, String)]) -> String {
3715+
let rflags = self.props.run_flags.as_ref();
37153716
let cflags = self.props.compile_flags.join(" ");
3716-
let json = cflags.contains("--error-format json")
3717+
let json = rflags
3718+
.map_or(false, |s| s.contains("--format json") || s.contains("--format=json"))
3719+
|| cflags.contains("--error-format json")
37173720
|| cflags.contains("--error-format pretty-json")
37183721
|| cflags.contains("--error-format=json")
37193722
|| cflags.contains("--error-format=pretty-json")

0 commit comments

Comments
 (0)