[lit] Attempt to fix builtin diff code for Python 2
authorReid Kleckner <rnk@google.com>
Mon, 2 Apr 2018 22:19:42 +0000 (22:19 +0000)
committerReid Kleckner <rnk@google.com>
Mon, 2 Apr 2018 22:19:42 +0000 (22:19 +0000)
llvm-svn: 329024

llvm/utils/lit/lit/TestRunner.py

index 02745e6..d0c7417 100644 (file)
@@ -12,6 +12,7 @@ import shutil
 import tempfile
 import threading
 
+import io
 try:
     from StringIO import StringIO
 except ImportError:
@@ -388,6 +389,8 @@ def executeBuiltinDiff(cmd, cmd_shenv):
     def compareTwoFiles(filepaths):
         filelines = []
         for file in filepaths:
+            compare_bytes = False
+            encoding = None
             try:
                 with open(file, 'r') as f:
                     filelines.append(f.readlines())