[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 test/shaping/Makefile.am                      |    2 +-
 test/shaping/tests/fallback-positioning.test  |    2 --
 test/shaping/tests/fallback-positioning.tests |    2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f8061ae7972462ad800c23be7cd7b3d7ab94b93b
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon May 2 10:28:24 2016 +0200

    [tests] Fix test

diff --git a/test/shaping/Makefile.am b/test/shaping/Makefile.am
index b3b6300..e67e3ef 100644
--- a/test/shaping/Makefile.am
+++ b/test/shaping/Makefile.am
@@ -47,7 +47,7 @@ TESTS = \
 	tests/context-matching.tests \
 	tests/cursive-positioning.tests \
 	tests/default-ignorables.tests \
-	tests/fallback-positioning.test \
+	tests/fallback-positioning.tests \
 	tests/fuzzed.tests \
 	tests/hangul-jamo.tests \
 	tests/hyphens.tests \
diff --git a/test/shaping/tests/fallback-positioning.test b/test/shaping/tests/fallback-positioning.test
deleted file mode 100644
index 499db7d..0000000
--- a/test/shaping/tests/fallback-positioning.test
+++ /dev/null
@@ -1,2 +0,0 @@
-fonts/sha1sum/7ef276fc886ea502a03b9b0e5c8b547d5dc2b61c.ttf:--font-funcs=ft:U+0078,U+0301,U+0058,U+0301:[x=0+1030|acutecomb=0 at -45,-32+0|X=2+1295|acutecomb=2 at -171,310+0]
-fonts/sha1sum/7ef276fc886ea502a03b9b0e5c8b547d5dc2b61c.ttf:--font-funcs=ot:U+0078,U+0301,U+0058,U+0301:[gid2=0+1030|gid4=0 at -21,-27+0|gid1=2+1295|gid4=2 at -147,321+0]
diff --git a/test/shaping/tests/fallback-positioning.tests b/test/shaping/tests/fallback-positioning.tests
new file mode 100644
index 0000000..499db7d
--- /dev/null
+++ b/test/shaping/tests/fallback-positioning.tests
@@ -0,0 +1,2 @@
+fonts/sha1sum/7ef276fc886ea502a03b9b0e5c8b547d5dc2b61c.ttf:--font-funcs=ft:U+0078,U+0301,U+0058,U+0301:[x=0+1030|acutecomb=0 at -45,-32+0|X=2+1295|acutecomb=2 at -171,310+0]
+fonts/sha1sum/7ef276fc886ea502a03b9b0e5c8b547d5dc2b61c.ttf:--font-funcs=ot:U+0078,U+0301,U+0058,U+0301:[gid2=0+1030|gid4=0 at -21,-27+0|gid1=2+1295|gid4=2 at -147,321+0]