diff options
| author | Joel E. Denny <jdenny.ornl@gmail.com> | 2019-10-12 18:51:08 +0000 |
|---|---|---|
| committer | Joel E. Denny <jdenny.ornl@gmail.com> | 2019-10-12 18:51:08 +0000 |
| commit | b005d9e86ffcc2cf3a3403106b6342e5ede27429 (patch) | |
| tree | 644061b0971f32a90692bb1d675790af8a75377a /llvm/utils | |
| parent | 459a93659a9b3a34027e9e0dac7be5d80914c122 (diff) | |
| download | bcm5719-llvm-b005d9e86ffcc2cf3a3403106b6342e5ede27429.tar.gz bcm5719-llvm-b005d9e86ffcc2cf3a3403106b6342e5ede27429.zip | |
Revert r374666: "[lit] Adjust error handling for decode introduced by r374665"
This series of patches still breaks a Windows bot.
llvm-svn: 374676
Diffstat (limited to 'llvm/utils')
| -rw-r--r-- | llvm/utils/lit/lit/builtin_commands/diff.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/utils/lit/lit/builtin_commands/diff.py b/llvm/utils/lit/lit/builtin_commands/diff.py index d851c4cb70d..ee933d8e59e 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="backslashreplace") + diff = diff.decode() sys.stdout.write(diff) exitCode = 1 return exitCode |
