From: Joel E. Denny <jdenny.ornl@gmail.com>
Date: Sat, 12 Oct 2019 18:51:18 +0000 (+0000)
Subject: Revert r374665: "[lit] Try yet again to fix new tests that fail on Windows bots"
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e9d3b8192ed63127a60b9dc7657f5157536d4fbd;p=platform%2Fupstream%2Fllvm.git

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
---

diff --git a/llvm/utils/lit/lit/builtin_commands/diff.py b/llvm/utils/lit/lit/builtin_commands/diff.py
index ee933d8..f413f87 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