[HarfBuzz] harfbuzz: Branch 'master' - 4 commits

[Behdad Esfahbod]

 test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf |binary
 test/subset/run-tests.py                                           |   10 +++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit e15e41ef12e146333e355defef8db210378b5be0
Author: Garret Rieger <grieger at google.com>
Date:   Thu Feb 22 18:41:50 2018 -0800

    [subset] Remove commented code from run-tests.py.

diff --git a/test/subset/run-tests.py b/test/subset/run-tests.py
index b1dc7bef..99f97826 100755
--- a/test/subset/run-tests.py
+++ b/test/subset/run-tests.py
@@ -77,9 +77,6 @@ def run_ttx(file):
 	return cmd(cli_args)
 
 def strip_check_sum (ttx_string):
-#	return re.sub ('checkSumAdjustment value=["]0x(\d+)["]',
-#		       'checkSumAdjustment value="0x00000000"',
-#		       ttx_string, count=1)
 	return re.sub ('checkSumAdjustment value=["]0x([0-9a-fA-F])+["]',
                        'checkSumAdjustment value="0x00000000"',
 		       ttx_string, count=1)
commit 2b844803433bd1557a7fd0c93a91c66ef5319b21
Author: Garret Rieger <grieger at google.com>
Date:   Thu Feb 22 18:38:44 2018 -0800

    [subset] Update expected files for subsetting integration test to not include cmap 4.

diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf
index 52706dc9..8d7e6b22 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf differ
commit a88504c601ac95601730bd602861c13e5ac4fdd8
Author: Garret Rieger <grieger at google.com>
Date:   Thu Feb 22 14:28:18 2018 -0800

    [subset] Fix checksum clearning in subset test diff. Add an updated expected file (has cmap4 restored).

diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf
index 501d1d28..52706dc9 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf differ
diff --git a/test/subset/run-tests.py b/test/subset/run-tests.py
index 0dc14f38..b1dc7bef 100755
--- a/test/subset/run-tests.py
+++ b/test/subset/run-tests.py
@@ -77,8 +77,11 @@ def run_ttx(file):
 	return cmd(cli_args)
 
 def strip_check_sum (ttx_string):
-	return re.sub ('checksumAdjustment value=["]0x(\d+)["]',
-		       'checksumAdjustment value="0x00000000"',
+#	return re.sub ('checkSumAdjustment value=["]0x(\d+)["]',
+#		       'checkSumAdjustment value="0x00000000"',
+#		       ttx_string, count=1)
+	return re.sub ('checkSumAdjustment value=["]0x([0-9a-fA-F])+["]',
+                       'checkSumAdjustment value="0x00000000"',
 		       ttx_string, count=1)
 
 args = sys.argv[1:]
commit 537698b60131bd3d7999919a04596c41dda6b2e4
Author: Garret Rieger <grieger at google.com>
Date:   Thu Feb 22 14:07:52 2018 -0800

    [subset] Don't compare actual to itself in Fix test/subset/run-tests. Print a diff on failure.

diff --git a/test/subset/run-tests.py b/test/subset/run-tests.py
index f648627e..0dc14f38 100755
--- a/test/subset/run-tests.py
+++ b/test/subset/run-tests.py
@@ -6,6 +6,7 @@
 from __future__ import print_function
 
 import io
+from difflib import unified_diff
 import os
 import re
 import subprocess
@@ -59,9 +60,12 @@ def run_test(test):
 		return fail_test(test, cli_args, "ttx (actual) returned %d" % (return_code))
 
 	expected_ttx = strip_check_sum (expected_ttx)
-	actual_ttx = strip_check_sum (expected_ttx)
+	actual_ttx = strip_check_sum (actual_ttx)
 
 	if not actual_ttx == expected_ttx:
+		for line in unified_diff(expected_ttx.splitlines(1), actual_ttx.splitlines(1)):
+			sys.stdout.write(line)
+		sys.stdout.flush()
 		return fail_test(test, cli_args, 'ttx for expected and actual does not match.')
 
 	return 0