about summary refs log tree commit diff
path: root/src/tools/compiletest
diff options
context:
space:
mode:
authorOliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>2017-11-20 09:40:55 +0100
committerOliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>2017-11-20 09:40:55 +0100
commit3864d8943b99138d46751aadda58e27a1f4e06e8 (patch)
treeea296e36ee400565c0f80f1df56c1d4eb0d3ce6a /src/tools/compiletest
parentddaf523aa437c8f6386a5f40e527b6d21ecb1a36 (diff)
downloadrust-3864d8943b99138d46751aadda58e27a1f4e06e8.tar.gz
rust-3864d8943b99138d46751aadda58e27a1f4e06e8.zip
Address PR comments
Diffstat (limited to 'src/tools/compiletest')
-rw-r--r--src/tools/compiletest/src/runtest.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index b74867aba2d..633f349ba50 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2411,7 +2411,11 @@ actual:\n\
         let mut normalized = output.replace(&parent_dir_str, "$DIR");
 
         if json {
-            normalized = normalized.replace("\\n", "\n"); // verbatim newline in json strings
+            // escaped newlines in json strings should be readable
+            // in the stderr files. There's no point int being correct,
+            // since only humans process the stderr files.
+            // Thus we just turn escaped newlines back into newlines.
+            normalized = normalized.replace("\\n", "\n");
         }
 
         normalized = normalized.replace("\\\\", "\\") // denormalize for paths on windows