.travis.yml | 2 +-
appveyor.yml | 2 +-
test/shaping/tests/indic-syllable.tests | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ea772932d2430ebc7ea712a8c46ec2500966225d
Merge: 771970ef c44657a0
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Tue Oct 3 13:25:44 2017 +0200
Merge commit 'c44657a05d565ec5f2c32ac15d4ecfbee00ac5f7'
commit 771970efa15fc0b77841b7f0a3e266cdcf51246e
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Tue Oct 3 13:23:31 2017 +0200
Minor
diff --git a/.travis.yml b/.travis.yml
index 70e5fa68..fd2139ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ script:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then export
CONFIGURE_OPTS="$CONFIGURE_OPTS --with-coretext"; fi
- ./configure $CONFIGURE_OPTS
- make
- - make check || (cat test/*/test-suite.log && false)
+ - make check || (cat */test-suite.log test/*/test-suite.log && false)
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$CC" == "gcc" -a "$TRAVIS_SLUG" ==
"behdad/harfbuzz" ]; then rm -f src/.libs/NONE.gcov; touch src/NONE; coveralls
-e docs; fi
after_success:
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$CC" == "gcc" -a
"$TRAVIS_SECURE_ENV_VARS" == "true" ]; then bash .ci/deploy-docs.sh; fi
diff --git a/appveyor.yml b/appveyor.yml
index 49d741ed..3d3f7774 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -65,7 +65,7 @@ build_script:
- 'if "%compiler%"=="nmake" nmake /f Makefile.vc CFG=%CFG% UNISCRIBE=1
DIRECTWRITE=1 install' # FREETYPE=1 install'
- 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm
-S
mingw-w64-$MSYS2_ARCH-{freetype,cairo,icu,gettext,gobject-introspection,gcc,gcc-libs,glib2,graphite2,pkg-config}"'
- - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd
$APPVEYOR_BUILD_FOLDER; PATH=$PATH:/mingw64/bin:/mingw32/bin; ./autogen.sh
--with-uniscribe --with-freetype --with-glib --with-gobject --with-cairo
--with-icu --with-graphite2 --build=%MINGW_CHOST% --host=%MINGW_CHOST%
--prefix=%MINGW_PREFIX%; make; make check || (cat test/*/test-suite.log &&
false)"'
+ - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd
$APPVEYOR_BUILD_FOLDER; PATH=$PATH:/mingw64/bin:/mingw32/bin; ./autogen.sh
--with-uniscribe --with-freetype --with-glib --with-gobject --with-cairo
--with-icu --with-graphite2 --build=%MINGW_CHOST% --host=%MINGW_CHOST%
--prefix=%MINGW_PREFIX%; make; make check || (cat */test-suite.log
test/*/test-suite.log && false)"'
# disable automatic tests
test: off
commit 09cbeb2246217dce61ccc0638edb6211facca4b0
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Tue Oct 3 13:22:07 2017 +0200
Make bots happy
Fixes https://github.com/behdad/harfbuzz/issues/551
diff --git a/test/shaping/tests/indic-syllable.tests
b/test/shaping/tests/indic-syllable.tests
index 3b5d1ebe..500fa84b 100644
--- a/test/shaping/tests/indic-syllable.tests
+++ b/test/shaping/tests/indic-syllable.tests
@@ -1,7 +1,7 @@
fonts/sha1sum/54674a3111d209fb6be0ed31745314b7a8d2c244.ttf::U+0BA4,U+0BCD,U+00B3:[taprehalftamil=0+1509|uni00B3=2+674]
fonts/sha1sum/3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf::U+0CF1:[gid1=0+1129]
fonts/sha1sum/3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf::U+0CF2:[gid2=0+1539]
-fonts/sha1sum/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf::U+0980,U+0981:[anjibeng=0+520|candrabindubeng=0+0]
+fonts/sha1sum/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf:--font-funcs=ot:U+0980,U+0981:[gid1=0+520|gid2=0+0]
fonts/sha1sum/85fe0be440c64ac77699e21c2f1bd933a919167e.ttf::U+0A15,U+0A51,U+0A47:[kaguru=0+1273|udaatguru=0@75,0+0|eematraguru=0@-40,0+0]
fonts/sha1sum/1735326da89f0818cd8c51a0600e9789812c0f94.ttf::U+0A51:[uni25CC=0+1044|udaatguru=0+0]
fonts/sha1sum/1735326da89f0818cd8c51a0600e9789812c0f94.ttf::U+25CC,U+0A51:[uni25CC=0+1044|udaatguru=0+0]
commit bbe94777c94637da1bcf944124b5079662618a1e
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Mon Oct 2 22:36:14 2017 +0200
Print test-suite.log when CI builds fail
diff --git a/.travis.yml b/.travis.yml
index 1b150584..70e5fa68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ script:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then export
CONFIGURE_OPTS="$CONFIGURE_OPTS --with-coretext"; fi
- ./configure $CONFIGURE_OPTS
- make
- - make check
+ - make check || (cat test/*/test-suite.log && false)
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$CC" == "gcc" -a "$TRAVIS_SLUG" ==
"behdad/harfbuzz" ]; then rm -f src/.libs/NONE.gcov; touch src/NONE; coveralls
-e docs; fi
after_success:
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$CC" == "gcc" -a
"$TRAVIS_SECURE_ENV_VARS" == "true" ]; then bash .ci/deploy-docs.sh; fi
diff --git a/appveyor.yml b/appveyor.yml
index 05a371a6..49d741ed 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -65,7 +65,7 @@ build_script:
- 'if "%compiler%"=="nmake" nmake /f Makefile.vc CFG=%CFG% UNISCRIBE=1
DIRECTWRITE=1 install' # FREETYPE=1 install'
- 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm
-S
mingw-w64-$MSYS2_ARCH-{freetype,cairo,icu,gettext,gobject-introspection,gcc,gcc-libs,glib2,graphite2,pkg-config}"'
- - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd
$APPVEYOR_BUILD_FOLDER; PATH=$PATH:/mingw64/bin:/mingw32/bin; ./autogen.sh
--with-uniscribe --with-freetype --with-glib --with-gobject --with-cairo
--with-icu --with-graphite2 --build=%MINGW_CHOST% --host=%MINGW_CHOST%
--prefix=%MINGW_PREFIX%; make; make check"'
+ - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd
$APPVEYOR_BUILD_FOLDER; PATH=$PATH:/mingw64/bin:/mingw32/bin; ./autogen.sh
--with-uniscribe --with-freetype --with-glib --with-gobject --with-cairo
--with-icu --with-graphite2 --build=%MINGW_CHOST% --host=%MINGW_CHOST%
--prefix=%MINGW_PREFIX%; make; make check || (cat test/*/test-suite.log &&
false)"'
# disable automatic tests
test: off
_______________________________________________
HarfBuzz mailing list
HarfBuzz@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/harfbuzz
