From: Joel E. Denny <jdenny.ornl@gmail.com>
Date: Sat, 12 Oct 2019 18:50:57 +0000 (+0000)
Subject: Revert r374671: "[lit] Try errors="ignore" for decode introduced by r374665"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2997b8a72d2236efa757d43c430050fdb587ad9;p=llvm

Revert r374671: "[lit] Try errors="ignore" for decode introduced by r374665"

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
---

diff --git a/utils/lit/lit/builtin_commands/diff.py b/utils/lit/lit/builtin_commands/diff.py
index c2ea5d86b9c..d851c4cb70d 100644
--- a/utils/lit/lit/builtin_commands/diff.py
+++ b/utils/lit/lit/builtin_commands/diff.py
@@ -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