diff options
| author | Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de> | 2017-11-03 13:38:26 +0100 |
|---|---|---|
| committer | Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de> | 2017-11-03 13:38:26 +0100 |
| commit | c7cb2cf8b5a9c7b5b57128a4969b0b577ecaf5d9 (patch) | |
| tree | a3d9efc3e308a9962204565cc9c9d9553850e9f3 /src/tools/compiletest | |
| parent | 65c899edfe889118af594c37d16e93f6c4b194f6 (diff) | |
| download | rust-c7cb2cf8b5a9c7b5b57128a4969b0b577ecaf5d9.tar.gz rust-c7cb2cf8b5a9c7b5b57128a4969b0b577ecaf5d9.zip | |
Pretty print json in ui tests
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index f8628158aff..128bccbee62 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -2378,7 +2378,8 @@ actual:\n\ fn normalize_output(&self, output: &str, custom_rules: &[(String, String)]) -> String { let parent_dir = self.testpaths.file.parent().unwrap(); let cflags = self.props.compile_flags.join(" "); - let parent_dir_str = if cflags.contains("--error-format json") { + let parent_dir_str = if cflags.contains("--error-format json") + || cflags.contains("--error-format pretty-json") { parent_dir.display().to_string().replace("\\", "\\\\") } else { parent_dir.display().to_string() |