]> granicus.if.org Git - llvm/commitdiff
Revert r374666: "[lit] Adjust error handling for decode introduced by r374665"
authorJoel E. Denny <jdenny.ornl@gmail.com>
Sat, 12 Oct 2019 18:51:08 +0000 (18:51 +0000)
committerJoel E. Denny <jdenny.ornl@gmail.com>
Sat, 12 Oct 2019 18:51:08 +0000 (18:51 +0000)
This series of patches still breaks a Windows bot.

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

utils/lit/lit/builtin_commands/diff.py

index d851c4cb70d7e632471d43094d0645ccf7537996..ee933d8e59e8808bac5a497f7114012ad1d9bae7 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="backslashreplace")
+            diff = diff.decode()
         sys.stdout.write(diff)
         exitCode = 1
     return exitCode