]> granicus.if.org Git - llvm/commitdiff
Revert r374671: "[lit] Try errors="ignore" for decode introduced by r374665"
authorJoel E. Denny <jdenny.ornl@gmail.com>
Sat, 12 Oct 2019 18:50:57 +0000 (18:50 +0000)
committerJoel E. Denny <jdenny.ornl@gmail.com>
Sat, 12 Oct 2019 18:50:57 +0000 (18:50 +0000)
This series of patches still breaks a Windows bot.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@374675 91177308-0d34-0410-b5e6-96231b3b80d8

utils/lit/lit/builtin_commands/diff.py

index c2ea5d86b9c5e70b86ea5b7643ae0f4ab08380dd..d851c4cb70d7e632471d43094d0645ccf7537996 100644 (file)
@@ -97,7 +97,7 @@ def compareTwoTextFiles(flags, filepaths, filelines_bin, encoding):
                      n = flags.num_context_lines):
         if hasattr(diff, 'decode'):
             # python 2.7
-            diff = diff.decode(errors="ignore")
+            diff = diff.decode(errors="backslashreplace")
         sys.stdout.write(diff)
         exitCode = 1
     return exitCode