about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2019-04-07 11:16:26 +0200
committerRalf Jung <post@ralfj.de>2019-04-14 10:01:32 +0200
commit8c5292eb8f6ac69e8bcf6908c687a813e739068e (patch)
tree2c4472e5c7a4578190b4c9091c42b481181d1f45
parentee621f42329069c296b4c2066b3743cc4ff0f369 (diff)
downloadrust-8c5292eb8f6ac69e8bcf6908c687a813e739068e.tar.gz
rust-8c5292eb8f6ac69e8bcf6908c687a813e739068e.zip
compiletest normalization: preserve non-JSON lines such as ICEs
-rw-r--r--src/tools/compiletest/src/json.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/json.rs b/src/tools/compiletest/src/json.rs
index 15d449260ef..ba919f4c411 100644
--- a/src/tools/compiletest/src/json.rs
+++ b/src/tools/compiletest/src/json.rs
@@ -78,7 +78,8 @@ pub fn extract_rendered(output: &str, proc_res: &ProcRes) -> String {
                     }
                 }
             } else {
-                None
+                // preserve non-JSON lines, such as ICEs
+                Some(format!("{}\n", line))
             }
         })
         .collect()