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

[test] minor style improve

This commit is contained in:
Ebrahim Byagowi 2019-05-28 13:48:39 +04:30 committed by GitHub
parent d64fb9db52
commit 13316ac5d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
# Runs a subsetting test suite. Compares the results of subsetting via harfbuz # Runs a subsetting test suite. Compares the results of subsetting via harfbuzz
# to subsetting via fonttools. # to subsetting via fonttools.
from __future__ import print_function, division, absolute_import from __future__ import print_function, division, absolute_import
@ -16,18 +16,18 @@ import tempfile
from subset_test_suite import SubsetTestSuite from subset_test_suite import SubsetTestSuite
# https://stackoverflow.com/a/377028 # https://stackoverflow.com/a/377028
def which(program): def which (program):
def is_exe(fpath): def is_exe (fpath):
return os.path.isfile(fpath) and os.access(fpath, os.X_OK) return os.path.isfile (fpath) and os.access (fpath, os.X_OK)
fpath, _ = os.path.split(program) fpath, _ = os.path.split (program)
if fpath: if fpath:
if is_exe(program): if is_exe (program):
return program return program
else: else:
for path in os.environ["PATH"].split(os.pathsep): for path in os.environ["PATH"].split (os.pathsep):
exe_file = os.path.join(path, program) exe_file = os.path.join (path, program)
if is_exe(exe_file): if is_exe (exe_file):
return exe_file return exe_file
return None return None
@ -36,7 +36,7 @@ fonttools = which ("fonttools")
ots_sanitize = which ("ots-sanitize") ots_sanitize = which ("ots-sanitize")
if not fonttools: if not fonttools:
print("fonttools is not present, skipping test.") print ("fonttools is not present, skipping test.")
sys.exit (77) sys.exit (77)
def cmd(command): def cmd(command):
@ -50,7 +50,7 @@ def read_binary (file_path):
with open (file_path, 'rb') as f: with open (file_path, 'rb') as f:
return f.read () return f.read ()
def fail_test(test, cli_args, message): def fail_test (test, cli_args, message):
print ('ERROR: %s' % message) print ('ERROR: %s' % message)
print ('Test State:') print ('Test State:')
print (' test.font_path %s' % os.path.abspath (test.font_path)) print (' test.font_path %s' % os.path.abspath (test.font_path))
@ -61,8 +61,8 @@ def fail_test(test, cli_args, message):
print (' expected_file %s' % os.path.abspath (expected_file)) print (' expected_file %s' % os.path.abspath (expected_file))
return 1 return 1
def run_test(test, should_check_ots): def run_test (test, should_check_ots):
out_file = os.path.join(tempfile.mkdtemp (), test.get_font_name () + '-subset' + test.get_font_extension ()) out_file = os.path.join (tempfile.mkdtemp (), test.get_font_name () + '-subset' + test.get_font_extension ())
cli_args = [hb_subset, cli_args = [hb_subset,
"--font-file=" + test.font_path, "--font-file=" + test.font_path,
"--output-file=" + out_file, "--output-file=" + out_file,
@ -76,11 +76,11 @@ def run_test(test, should_check_ots):
return fail_test (test, cli_args, "%s returned %d" % (' '.join (cli_args), return_code)) return fail_test (test, cli_args, "%s returned %d" % (' '.join (cli_args), return_code))
expected_ttx, return_code = run_ttx (os.path.join (test_suite.get_output_directory (), expected_ttx, return_code = run_ttx (os.path.join (test_suite.get_output_directory (),
test.get_font_name ())) test.get_font_name ()))
if return_code: if return_code:
return fail_test (test, cli_args, "ttx (expected) returned %d" % (return_code)) return fail_test (test, cli_args, "ttx (expected) returned %d" % (return_code))
actual_ttx, return_code = run_ttx(out_file) actual_ttx, return_code = run_ttx (out_file)
if return_code: if return_code:
return fail_test (test, cli_args, "ttx (actual) returned %d" % (return_code)) return fail_test (test, cli_args, "ttx (actual) returned %d" % (return_code))
@ -92,7 +92,7 @@ def run_test(test, should_check_ots):
for line in unified_diff (expected_ttx.splitlines (1), actual_ttx.splitlines (1)): for line in unified_diff (expected_ttx.splitlines (1), actual_ttx.splitlines (1)):
sys.stdout.write (line) sys.stdout.write (line)
sys.stdout.flush () sys.stdout.flush ()
return fail_test(test, cli_args, 'ttx for expected and actual does not match.') return fail_test (test, cli_args, 'ttx for expected and actual does not match.')
if should_check_ots: if should_check_ots:
print ("Checking output with ots-sanitize.") print ("Checking output with ots-sanitize.")
@ -103,7 +103,7 @@ def run_test(test, should_check_ots):
def run_ttx (file): def run_ttx (file):
print ("fonttools ttx %s" % file) print ("fonttools ttx %s" % file)
return cmd([fonttools, "ttx", "-q", "-o-", file]) return cmd ([fonttools, "ttx", "-q", "-o-", 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])+["]',
@ -124,7 +124,7 @@ def check_ots (path):
return True return True
args = sys.argv[1:] args = sys.argv[1:]
if not args or sys.argv[1].find('hb-subset') == -1 or not os.path.exists (sys.argv[1]): if not args or sys.argv[1].find ('hb-subset') == -1 or not os.path.exists (sys.argv[1]):
print ("First argument does not seem to point to usable hb-subset.") print ("First argument does not seem to point to usable hb-subset.")
sys.exit (1) sys.exit (1)
hb_subset, args = args[0], args[1:] hb_subset, args = args[0], args[1:]
@ -139,7 +139,7 @@ fails = 0
for path in args: for path in args:
with io.open (path, mode="r", encoding="utf-8") as f: with io.open (path, mode="r", encoding="utf-8") as f:
print ("Running tests in " + path) print ("Running tests in " + path)
test_suite = SubsetTestSuite (path, f.read()) test_suite = SubsetTestSuite (path, f.read ())
for test in test_suite.tests (): for test in test_suite.tests ():
fails += run_test (test, has_ots) fails += run_test (test, has_ots)