walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: fix subset/run-tests.py under Windows 

It assumed that stdout of a subprocess in binary mode was using
utf-8 which isn't the case. Instead open stdout of the subprocess
in text mode and let Python handle the decoding.
This commit is contained in:
Christoph Reiter 2020-04-18 20:28:25 +02:00 committed by Ebrahim Byagowi
parent c1228990b9
commit 2354a90008
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/subset/run-tests.py
View File

@ -23,7 +23,8 @@ if not fonttools:
def cmd(command): def cmd(command):
p = subprocess.Popen ( p = subprocess.Popen (
command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) command, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
universal_newlines=True)
(stdoutdata, stderrdata) = p.communicate () (stdoutdata, stderrdata) = p.communicate ()
print (stderrdata, end="") # file=sys.stderr print (stderrdata, end="") # file=sys.stderr
return stdoutdata, p.returncode return stdoutdata, p.returncode
@ -91,7 +92,7 @@ def run_ttx (file):
def strip_check_sum (ttx_string): def strip_check_sum (ttx_string):
return re.sub ('checkSumAdjustment value=["]0x([0-9a-fA-F])+["]', return re.sub ('checkSumAdjustment value=["]0x([0-9a-fA-F])+["]',
'checkSumAdjustment value="0x00000000"', 'checkSumAdjustment value="0x00000000"',
ttx_string.decode ("utf-8"), count=1) ttx_string, count=1)
def has_ots (): def has_ots ():
if not ots_sanitize: if not ots_sanitize: