From 459a93659a9b3a34027e9e0dac7be5d80914c122 Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Sat, 12 Oct 2019 18:50:57 +0000 Subject: [PATCH] Revert r374671: "[lit] Try errors="ignore" for decode introduced by r374665" This series of patches still breaks a Windows bot. llvm-svn: 374675 --- llvm/utils/lit/lit/builtin_commands/diff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/utils/lit/lit/builtin_commands/diff.py b/llvm/utils/lit/lit/builtin_commands/diff.py index c2ea5d86b9c5..d851c4cb70d7 100644 --- a/llvm/utils/lit/lit/builtin_commands/diff.py +++ b/llvm/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