From 8e3b4c0e11642470069b866a73768a866ac3fdb3 Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaledhosny@eglug.org>
Date: Thu, 15 Feb 2018 11:25:24 +0200
Subject: [PATCH] Simplify calls to collect-logs.sh

---
 .ci/{collect-logs.sh => fail.sh} |  3 +++
 .circleci/config.yml             | 13 +++++++++----
 .travis.yml                      |  6 +++---
 appveyor.yml                     |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)
 rename .ci/{collect-logs.sh => fail.sh} (71%)

diff --git a/.ci/collect-logs.sh b/.ci/fail.sh
similarity index 71%
rename from .ci/collect-logs.sh
rename to .ci/fail.sh
index a3d46a48e..5f4b64158 100755
--- a/.ci/collect-logs.sh
+++ b/.ci/fail.sh
@@ -4,3 +4,6 @@ for f in $(find . -name '*.log' -not -name 'config.log'); do
     echo '====' $f '===='
     cat $f
 done
+
+# Intentionally exiting with non-zero.
+exit 1
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 28b631600..28b5f7ce5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,10 @@ jobs:
       - checkout
       - run: apt update && apt install -y ninja-build binutils libtool autoconf automake make cmake gcc g++ pkg-config ragel gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip
       - run: pip install fonttools
-      - run: ./autogen.sh && (make distcheck || (cd harfbuzz-* && ../.ci/collect-logs.sh && false)) && rm -rf harfbuzz-*
+      - run: ./autogen.sh
+      - run: make
+      - run: make distcheck || .ci/fail.sh
+      - run: rm -rf harfbuzz-*
       - run: make distdir && cd harfbuzz-* && cmake -DHB_CHECK=ON -Bbuild -H. -GNinja && ninja -Cbuild && CTEST_OUTPUT_ON_FAILURE=1 ninja -Cbuild test && ninja -Cbuild install
 
   alpine:
@@ -19,7 +22,8 @@ jobs:
       - checkout
       - run: apk update && apk add ragel make pkgconfig libtool autoconf automake gettext gcc g++ glib-dev freetype-dev cairo-dev
       - run: ./autogen.sh
-      - run: make && (make check || (.ci/collect-logs.sh && false))
+      - run: make
+      - run: make check || .ci/fail.sh
 
   archlinux:
     docker:
@@ -28,7 +32,8 @@ jobs:
       - checkout
       - run: pacman --noconfirm -Syu freetype2 cairo icu gettext gobject-introspection gcc gcc-libs glib2 graphite pkg-config ragel python
       - run: ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2
-      - run: make && (make check || (.ci/collect-logs.sh && false))
+      - run: make
+      - run: make check || .ci/fail.sh
 
   fedora-outoftreebuild:
     docker:
@@ -37,7 +42,7 @@ jobs:
       - checkout
       - run: dnf install -y pkg-config ragel gcc gcc-c++ automake autoconf libtool make which glib2-devel freetype-devel cairo-devel libicu-devel gobject-introspection-devel graphite2-devel redhat-rpm-config python || true
       - run: NOCONFIGURE=1 ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2
-      - run: mkdir build && cd build && ../configure && make && (make check || (.ci/collect-logs.sh && false))
+      - run: mkdir build && cd build && ../configure && make && (make check || ../.ci/fail.sh)
 
   cmake-gcc:
     docker:
diff --git a/.travis.yml b/.travis.yml
index a68ef7dc1..04f1cdcbc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ matrix:
         - ./autogen.sh
         - ./configure $CONFIGURE_OPTS --enable-gtk-doc
         - make
-        - make check || (.ci/collect-logs.sh && false)
+        - make check || .ci/fail.sh
       after_success:
         - bash .ci/run-coveralls.sh # for coveralls.io code coverage tracking
         - bash .ci/deploy-docs.sh
@@ -43,7 +43,7 @@ matrix:
         - ./autogen.sh
         - ./configure $CONFIGURE_OPTS
         - make
-        - make check || (.ci/collect-logs.sh && false)
+        - make check || .ci/fail.sh
 
     - os: osx
       compiler: clang
@@ -59,7 +59,7 @@ matrix:
         - ./autogen.sh
         - ./configure $CONFIGURE_OPTS --with-coretext
         - make
-        - make check || (.ci/collect-logs.sh && false)
+        - make check || .ci/fail.sh
 
 notifications:
   irc: "irc.freenode.org#harfbuzz"
diff --git a/appveyor.yml b/appveyor.yml
index 63e711fea..9bed12474 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -44,7 +44,7 @@ build_script:
   - 'if "%compiler%"=="msvc" if not "%platform%"=="ARM" ctest --output-on-failure -C %configuration%'
 
   - '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,python2}"'
-  - '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 || (.ci/collect-logs.sh && 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 || .ci/fail.sh"'
 
 cache:
   - c:\tools\vcpkg\installed\