summaryrefslogtreecommitdiffstats
path: root/llvm/utils/lit
diff options
context:
space:
mode:
authorReid Kleckner <rnk@google.com>2018-04-02 22:19:42 +0000
committerReid Kleckner <rnk@google.com>2018-04-02 22:19:42 +0000
commit30b215e8f742a6d2ef155aec9887f49c3e9ad501 (patch)
tree6bb3f538dbf7767a60912217ecefe693d7cd0510 /llvm/utils/lit
parent24a77396a92d365f6356baf68482b88cbc5e7e8c (diff)
downloadbcm5719-llvm-30b215e8f742a6d2ef155aec9887f49c3e9ad501.tar.gz
bcm5719-llvm-30b215e8f742a6d2ef155aec9887f49c3e9ad501.zip
[lit] Attempt to fix builtin diff code for Python 2
llvm-svn: 329024
Diffstat (limited to 'llvm/utils/lit')
-rw-r--r--llvm/utils/lit/lit/TestRunner.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/llvm/utils/lit/lit/TestRunner.py b/llvm/utils/lit/lit/TestRunner.py
index 02745e62dcf..d0c7417c248 100644
--- a/llvm/utils/lit/lit/TestRunner.py
+++ b/llvm/utils/lit/lit/TestRunner.py
@@ -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())
OpenPOWER on IntegriCloud