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

Joel E. Denny via llvm-commits llvm-commits at lists.llvm.org
Sat Oct 12 11:50:57 PDT 2019


Author: jdenny
Date: Sat Oct 12 11:50:57 2019
New Revision: 374675

URL: http://llvm.org/viewvc/llvm-project?rev=374675&view=rev
Log:
Revert r374671: "[lit] Try errors="ignore" for decode introduced by r374665"

This series of patches still breaks a Windows bot.

Modified:
    llvm/trunk/utils/lit/lit/builtin_commands/diff.py

Modified: llvm/trunk/utils/lit/lit/builtin_commands/diff.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/builtin_commands/diff.py?rev=374675&r1=374674&r2=374675&view=diff
==============================================================================
--- llvm/trunk/utils/lit/lit/builtin_commands/diff.py (original)
+++ llvm/trunk/utils/lit/lit/builtin_commands/diff.py Sat Oct 12 11:50:57 2019
@@ -97,7 +97,7 @@ def compareTwoTextFiles(flags, filepaths
                      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




More information about the llvm-commits mailing list