diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2020-02-27 17:20:32 +0100 |
|---|---|---|
| committer | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2020-03-02 13:19:10 +0100 |
| commit | 1c01646e6f1ed540fa1be66f3389181ad5644778 (patch) | |
| tree | e9cb677ebe0cef8af356e4e6cc86cb13e652edbf /src/tools/compiletest | |
| parent | f1070b152546827e599cdee1f64c55faaf8bf082 (diff) | |
| download | rust-1c01646e6f1ed540fa1be66f3389181ad5644778.tar.gz rust-1c01646e6f1ed540fa1be66f3389181ad5644778.zip | |
Extend json detection in runtest
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index ac808b1f14e..86621e8812b 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -3204,7 +3204,9 @@ impl<'test> TestCx<'test> { let json = cflags.contains("--error-format json") || cflags.contains("--error-format pretty-json") || cflags.contains("--error-format=json") - || cflags.contains("--error-format=pretty-json"); + || cflags.contains("--error-format=pretty-json") + || cflags.contains("--output-format json") + || cflags.contains("--output-format=json"); let mut normalized = output.to_string(); |