diff --git a/test/subset/data/Makefile.am b/test/subset/data/Makefile.am index 0b0013431..0d1b2f03c 100644 --- a/test/subset/data/Makefile.am +++ b/test/subset/data/Makefile.am @@ -9,6 +9,7 @@ EXTRA_DIST = \ $(TESTS) \ expected/basics \ expected/full-font \ + expected/japanese \ fonts \ profiles \ $(NULL) diff --git a/test/subset/data/Makefile.sources b/test/subset/data/Makefile.sources index bc8139379..dd1bcfe7a 100644 --- a/test/subset/data/Makefile.sources +++ b/test/subset/data/Makefile.sources @@ -1,6 +1,7 @@ TESTS = \ tests/basics.tests \ tests/full-font.tests \ + tests/japanese.tests \ $(NULL) XFAIL_TESTS = \ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf new file mode 100644 index 000000000..db7daa889 Binary files /dev/null and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf new file mode 100644 index 000000000..d05b5eece Binary files /dev/null and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.61,63,65,6B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.61,63,65,6B.ttf new file mode 100644 index 000000000..cef6a42cb Binary files /dev/null and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.61,63,65,6B.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf new file mode 100644 index 000000000..d7852d8a2 Binary files /dev/null and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf new file mode 100644 index 000000000..be607c294 Binary files /dev/null and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,3048,304A,304B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,3048,304A,304B.ttf new file mode 100644 index 000000000..1e5a7c7fc Binary files /dev/null and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,3048,304A,304B.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf new file mode 100644 index 000000000..3845822d8 Binary files /dev/null and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.61,63,65,6B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.61,63,65,6B.ttf new file mode 100644 index 000000000..fce812323 Binary files /dev/null and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.61,63,65,6B.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf new file mode 100644 index 000000000..b72eaf9c6 Binary files /dev/null and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf new file mode 100644 index 000000000..ee7baba66 Binary files /dev/null and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf differ diff --git a/test/subset/data/fonts/Mplus1p-Regular.ttf b/test/subset/data/fonts/Mplus1p-Regular.ttf new file mode 100644 index 000000000..2a5205ef0 Binary files /dev/null and b/test/subset/data/fonts/Mplus1p-Regular.ttf differ diff --git a/test/subset/data/tests/japanese.tests b/test/subset/data/tests/japanese.tests new file mode 100644 index 000000000..5a0438012 --- /dev/null +++ b/test/subset/data/tests/japanese.tests @@ -0,0 +1,16 @@ +FONTS: +Mplus1p-Regular.ttf + +PROFILES: +default.txt +drop-hints.txt + +SUBSETS: +明 +acek +明極珠度輸清 +あいうえおか +あいう珠度輸 + + + diff --git a/test/subset/run-tests.py b/test/subset/run-tests.py index 56cd7b4c3..4c77de097 100755 --- a/test/subset/run-tests.py +++ b/test/subset/run-tests.py @@ -19,9 +19,9 @@ from subset_test_suite import SubsetTestSuite def cmd(command): p = subprocess.Popen ( command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - p.wait () - print (p.stderr.read (), end="") # file=sys.stderr - return p.stdout.read (), p.returncode + (stdoutdata, stderrdata) = p.communicate() + print (stderrdata, end="") # file=sys.stderr + return stdoutdata, p.returncode def read_binary(file_path): with open(file_path, 'rb') as f: @@ -60,6 +60,7 @@ def run_test(test, should_check_ots): if return_code: return fail_test(test, cli_args, "ttx (actual) returned %d" % (return_code)) + print ("stripping checksums.") expected_ttx = strip_check_sum (expected_ttx) actual_ttx = strip_check_sum (actual_ttx) @@ -77,6 +78,7 @@ def run_test(test, should_check_ots): return 0 def run_ttx(file): + print ("ttx %s" % file) cli_args = ["ttx", "-o-", file]