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

[Behdad Esfahbod]

 test/shaping/run-tests.sh                    |    3 +--
 test/shaping/tests/cursive-positioning.tests |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit af48e3d27c01c538f46f1dc376d994a0c24a8170
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Feb 24 16:06:40 2016 +0900

    Fix recent test
    
    Not sure why the FT functions were returning advance 1024.  This
    caused failure on drone.io.  Switch to hb-ot-font and disable
    glyph names.

diff --git a/test/shaping/tests/cursive-positioning.tests b/test/shaping/tests/cursive-positioning.tests
index 6455202..ce63bd1 100644
--- a/test/shaping/tests/cursive-positioning.tests
+++ b/test/shaping/tests/cursive-positioning.tests
@@ -1,4 +1,4 @@
 fonts/sha1sum/c4e48b0886ef460f532fb49f00047ec92c432ec0.ttf::U+0643,U+0645,U+0645,U+062B,U+0644:[gid8=4+738|gid5=3 at 441,1197+0|gid6=3 at 0,432+405|gid9=2 at 0,477+452|gid9=1 at 0,977+452|gid10=0 at 20,1577+207]
 fonts/sha1sum/298c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf::U+0643,U+0645,U+0645,U+062B,U+0644:[gid8=4+738|gid5=3 at 441,1197+0|gid6=3 at 0,432+405|gid9=2 at 0,477+500|gid9=1 at 0,577+452|gid10=0 at 20,1177+207]
 #fonts/sha1sum/706c5d7b625f207bc0d874c67237aad6f1e9cd6f.ttf::U+0B1F,U+0B4D,U+0B1A,U+0B4D,U+0B1A:[ttaorya=0+1307|casubscriptorya=0 at -242,104+-231|casubscriptnarroworya=0 at 20,104+507]
-fonts/sha1sum/07f054357ff8638bac3711b422a1e31180bba863.ttf::U+0606,U+06E1:[Glyph2=0 at 40,502+0|Glyph1=0+1024]
+fonts/sha1sum/07f054357ff8638bac3711b422a1e31180bba863.ttf:--font-funcs=ot --no-glyph-names:U+0606,U+06E1:[2=0 at 40,502+0|1=0+1000]
commit 17c831701756bb46300c412fd64b19d67f299c18
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Feb 24 16:06:23 2016 +0900

    [tests] Fix for multiple options in test runner scripts

diff --git a/test/shaping/run-tests.sh b/test/shaping/run-tests.sh
index 47bf25b..021c6f8 100755
--- a/test/shaping/run-tests.sh
+++ b/test/shaping/run-tests.sh
@@ -18,10 +18,9 @@ if test $# = 0; then
 	set /dev/stdin
 fi
 
-IFS=:
 for f in "$@"; do
 	$reference || echo "Running tests in $f"
-	while read fontfile options unicodes glyphs_expected; do
+	while IFS=: read fontfile options unicodes glyphs_expected; do
 		if echo "$fontfile" | grep -q '^#'; then
 			$reference || echo "Skipping $fontfile:$unicodes"
 			continue