Merge pull request #871 from googlefonts/mplus

[subset] Add a Japanese font to the subset integration tests.

test/subset/data/Makefile.am

@@ -9,6 +9,7 @@ EXTRA_DIST = \
 	$(TESTS) \
 	expected/basics \
 	expected/full-font \
+	expected/japanese \
 	fonts \
 	profiles \
 	$(NULL)

test/subset/data/Makefile.sources

@@ -1,6 +1,7 @@
 TESTS = \
 	tests/basics.tests \
 	tests/full-font.tests \
+	tests/japanese.tests \
 	$(NULL)
 
 XFAIL_TESTS = \

test/subset/data/tests/japanese.tests

@@ -0,0 +1,16 @@
+FONTS:
+Mplus1p-Regular.ttf
+
+PROFILES:
+default.txt
+drop-hints.txt
+
+SUBSETS:
+明
+acek
+明極珠度輸清
+あいうえおか
+あいう珠度輸
+
+
+

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]