[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 test/shaping/Makefile.am  |    1 +
 test/shaping/run-tests.sh |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b9d0077ac1a8e8a62ee15c64ad302f7976e23bdd
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Oct 28 20:44:03 2013 +0100

    Fix win32 testing

diff --git a/test/shaping/Makefile.am b/test/shaping/Makefile.am
index 7fcb54c..42c37c3 100644
--- a/test/shaping/Makefile.am
+++ b/test/shaping/Makefile.am
@@ -36,6 +36,7 @@ CLEANFILES += \
 
 TESTS = tests/context-matching.tests
 TESTS_ENVIRONMENT = \
+	EXEEXT="$(EXEEXT)" \
 	srcdir="$(srcdir)" \
 	builddir="$(builddir)" \
 	$(srcdir)/run-tests.sh \
diff --git a/test/shaping/run-tests.sh b/test/shaping/run-tests.sh
index 1da2064..4f34f94 100755
--- a/test/shaping/run-tests.sh
+++ b/test/shaping/run-tests.sh
@@ -4,7 +4,7 @@ test "x$srcdir" = x && srcdir=.
 test "x$builddir" = x && builddir=.
 test "x$top_builddir" = x && top_builddir=../..
 
-hb_shape=$top_builddir/util/hb-shape
+hb_shape=$top_builddir/util/hb-shape$EXEEXT
 
 fails=0