maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lit] Prefer opening files with open (Python 2) rather than io.open which requires io. 

Only rely on Python 3 (io.open) when necessary. This puts TestRunnyer.py closer to how it behaved 
before the changes introduced in D43165 and silences a few Windows build bot failures.

Thanks to Stella Stamenova for the patch!

llvm-svn: 329037
This commit is contained in:
Aaron Smith 2018-04-03 00:22:12 +00:00
parent 7855e77b91
commit 061354b586
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/utils/lit/lit/TestRunner.py
View File

@ -392,14 +392,12 @@ def executeBuiltinDiff(cmd, cmd_shenv):
encoding = None encoding = None
filelines = [] filelines = []
for file in filepaths: for file in filepaths:
compare_bytes = False
encoding = None
try: try:
with open(file, 'r') as f: with open(file, 'r') as f:
filelines.append(f.readlines()) filelines.append(f.readlines())
except UnicodeDecodeError: except UnicodeDecodeError:
try: try:
with open(file, 'r', encoding="utf-8") as f: with io.open(file, 'r', encoding="utf-8") as f:
filelines.append(f.readlines()) filelines.append(f.readlines())
encoding = "utf-8" encoding = "utf-8"
except: except:
@ -416,7 +414,7 @@ def executeBuiltinDiff(cmd, cmd_shenv):
with open(file, 'rb') as f: with open(file, 'rb') as f:
filelines.append(f.readlines()) filelines.append(f.readlines())
exitCode = 0 exitCode = 0
if hasattr(difflib, 'diff_bytes'): if hasattr(difflib, 'diff_bytes'):
# python 3.5 or newer # python 3.5 or newer
diffs = difflib.diff_bytes(difflib.unified_diff, filelines[0], filelines[1], filepaths[0].encode(), filepaths[1].encode()) diffs = difflib.diff_bytes(difflib.unified_diff, filelines[0], filelines[1], filepaths[0].encode(), filepaths[1].encode())
@ -434,10 +432,14 @@ def executeBuiltinDiff(cmd, cmd_shenv):
def compareTwoTextFiles(filepaths, encoding): def compareTwoTextFiles(filepaths, encoding):
filelines = [] filelines = []
for file in filepaths: for file in filepaths:
with io.open(file, 'r', encoding=encoding) as f: if encoding is None:
filelines.append(f.readlines()) with open(file, 'r') as f:
filelines.append(f.readlines())
else:
with io.open(file, 'r', encoding=encoding) as f:
filelines.append(f.readlines())
exitCode = 0 exitCode = 0
def compose2(f, g): def compose2(f, g):
return lambda x: f(g(x)) return lambda x: f(g(x))