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

[Behdad Esfahbod]

 .travis.yml |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 19360e0a5609c65842a989587b01a4dc7c9eae36
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Oct 1 17:35:03 2014 -0400

    [travis] Report matrix settings to help debugging

diff --git a/.travis.yml b/.travis.yml
index 0574924..cc706c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,12 @@ before_script:
   - true
 script:
   - NOCONFIGURE=1 ./autogen.sh
+  - echo CC=$CC
+  - echo CXX=$CXX
+  - echo CPP=$CPP
+  - echo LD=$LD
+  - echo CPPFLAGS="$CPPFLAGS"
+  - echo LDFLAGS="$LDFLAGS"
   - ./configure $FEATURES CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
   - make
   - make check
commit 9b89fc52f49b80df1f27ac7de69e0152bdcc94d6
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Oct 1 17:20:31 2014 -0400

    [travis] More coveralls

diff --git a/.travis.yml b/.travis.yml
index 8d20278..0574924 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,10 @@ language: cpp
 compiler:
   #- clang
   - gcc
+env:
+  global:
+    - FEATURES="--with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2"
+    - CPPFLAGS="-Werror -fprofile-arcs -ftest-coverage" LDFLAGS="-lgcov"
 before_install:
   - sudo apt-get install pkg-config ragel gtk-doc-tools # for autogen.sh
   - sudo apt-get install libfreetype6-dev # for font functions
@@ -16,11 +20,12 @@ before_script:
   - true
 script:
   - NOCONFIGURE=1 ./autogen.sh
-  - ./configure --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2 CPPFLAGS="-Werror -fprofile-arcs -ftest-coverage" LDFLAGS=-lgcov
+  - ./configure $FEATURES CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
   - make
   - make check
 after_success:
   - rm -f src/.libs/NONE.gcov # coveralls chokes on this
+  - touch src/NONE # see if this makes coveralls happy
   - coveralls
 after_failure:
   - true