diff options
| author | Joel E. Denny <jdenny.ornl@gmail.com> | 2019-10-12 18:51:18 +0000 |
|---|---|---|
| committer | Joel E. Denny <jdenny.ornl@gmail.com> | 2019-10-12 18:51:18 +0000 |
| commit | e9d3b8192ed63127a60b9dc7657f5157536d4fbd (patch) | |
| tree | 2eb9116959bebf5fb3be2d516026e83e0b0ffb9a /llvm | |
| parent | b005d9e86ffcc2cf3a3403106b6342e5ede27429 (diff) | |
| download | bcm5719-llvm-e9d3b8192ed63127a60b9dc7657f5157536d4fbd.tar.gz bcm5719-llvm-e9d3b8192ed63127a60b9dc7657f5157536d4fbd.zip | |
Revert r374665: "[lit] Try yet again to fix new tests that fail on Windows bots"
This series of patches still breaks a Windows bot.
llvm-svn: 374677
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/utils/lit/lit/builtin_commands/diff.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/llvm/utils/lit/lit/builtin_commands/diff.py b/llvm/utils/lit/lit/builtin_commands/diff.py index ee933d8e59e..f413f87425c 100644 --- a/llvm/utils/lit/lit/builtin_commands/diff.py +++ b/llvm/utils/lit/lit/builtin_commands/diff.py @@ -95,9 +95,6 @@ def compareTwoTextFiles(flags, filepaths, filelines_bin, encoding): func = difflib.unified_diff if flags.unified_diff else difflib.context_diff for diff in func(filelines[0], filelines[1], filepaths[0], filepaths[1], n = flags.num_context_lines): - if hasattr(diff, 'decode'): - # python 2.7 - diff = diff.decode() sys.stdout.write(diff) exitCode = 1 return exitCode |
