From ca5ed8f9a85040a61167a1decedf99fd8ed9683b Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Date: Wed, 20 Jan 2016 22:33:48 +0300
Subject: [PATCH] Simplify travis config

---
 .travis.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index be35cff..341e00c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,20 +4,18 @@ dist: trusty
 matrix:
   include:
     - compiler: gcc
-      env: CMAKE_FLAGS="-DSDL2PP_CXXSTD=c++11"
+      env: CXXSTD=c++11 BUILD_TYPE=Coverage
     - compiler: gcc
-      env: CMAKE_FLAGS="-DSDL2PP_CXXSTD=c++1y"
-    - compiler: gcc
-      env: CMAKE_FLAGS="-DSDL2PP_CXXSTD=c++11 -DCMAKE_BUILD_TYPE=Coverage" COVERAGE=yes
+      env: CXXSTD=c++1y
     - compiler: clang
-      env: CMAKE_FLAGS="-DSDL2PP_CXXSTD=c++11"
+      env: CXXSTD=c++11
     - compiler: clang
-      env: CMAKE_FLAGS="-DSDL2PP_CXXSTD=c++1y"
+      env: CXXSTD=c++1y
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq cmake libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libsdl2-mixer-dev cppcheck doxygen pulseaudio
   - sudo sed -i -e '/using ::gets/ d' /usr/include/c++/4.8/cstdio # build failure with clang/c++1y
-  - if [ -n "$COVERAGE" ]; then pip install --user pyyaml; pip install --user cpp-coveralls; fi
+  - if [ "$BUILD_TYPE" = "Coverage" ]; then pip install --user pyyaml cpp-coveralls; fi
 
   # evironment for live tests
   - dbus-launch pulseaudio --start
@@ -28,11 +26,11 @@ before_install:
   - export DISPLAY=:99.0
 
 script:
-  - cmake . -DCMAKE_INSTALL_PREFIX=`pwd`.prefix -DSDL2PP_WITH_WERROR=YES $CMAKE_FLAGS
+  - cmake . -DCMAKE_INSTALL_PREFIX=`pwd`.prefix -DSDL2PP_WITH_WERROR=YES -DSDL2PP_CXXSTD=$CXXSTD -DCMAKE_BUILD_TYPE=$BUILD_TYPE
   - VERBOSE=1 make && make test && make install
   - cppcheck -I . --enable=performance,portability,information,missingInclude --error-exitcode=2 SDL2pp # `style' gives false positive in cppcheck 1.61 which comes with trusty
   - "if make doxygen 2>&1 | grep 'warning:'; then echo 'FATAL: doxygen warnings!'; false; fi"
   - "if git ls-files --others --exclude-standard | grep ''; then echo 'FATAL: incomplete .gitignore'; false; fi"
 
 after_success:
-  - if [ -n "$COVERAGE" ]; then coveralls -i SDL2pp; fi
+  - if [ "$BUILD_TYPE" = "Coverage" ]; then coveralls -i SDL2pp; fi