WIP

mptre · Jan 11, 2018 · 9526d17 · 9526d17
1 parent 186a6a1
commit 9526d17
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,10 @@ matrix:
   include:
     - os: linux
       compiler: clang
-      env: BUILD_TYPE=default CFLAGS='-fsanitize=address -fsanitize=undefined -Werror'
+      env: BUILD_TYPE=default MAKEFLAGS="CFLAGS=-fsanitize=address\\ -fsanitize=undefined\\ -Werror"
     - os: linux
       compiler: clang-5.0
-      env: BUILD_TYPE=default CFLAGS='-fsanitize=address -fsanitize=undefined -Werror'
+      env: BUILD_TYPE=default MAKEFLAGS='CFLAGS="-fsanitize=address -fsanitize=undefined -Werror"'
       addons:
         apt:
           sources:
@@ -20,13 +20,13 @@ matrix:
             - clang-5.0
     - os: linux
       compiler: gcc
-      env: BUILD_TYPE=default CFLAGS='-fsanitize=address -Werror'
+      env: BUILD_TYPE=default MAKEFLAGS='CFLAGS="-fsanitize=address -Werror"'
     - os: osx
       compiler: clang
-      env: BUILD_TYPE=default CFLAGS='-fsanitize=address -Werror'
+      env: BUILD_TYPE=default MAKEFLAGS='CFLAGS="-fsanitize=address -Werror"'
     - os: linux
       compiler: clang
-      env: BUILD_TYPE=coverage CFLAGS='-coverage -O0 -Werror'
+      env: BUILD_TYPE=coverage MAKEFLAGS='CFLAGS="-coverage -O0 -Werror"'
     - os: linux
       compiler: clang
       env: BUILD_TYPE=coverity
@@ -62,14 +62,12 @@ script:
     default)
       ./autogen.sh
       ./configure || (cat config.log; exit 1)
-      make
-      make distcheck || (find . -name test-suite.log | xargs -t cat; exit 1)
+      make ${MAKEFLAGS} distcheck || (find . -name test-suite.log | xargs -t cat; exit 1)
       ;;
     coverage)
       ./autogen.sh
       ./configure || (cat config.log; exit 1)
-      make
-      make check || (find . -name test-suite.log | xargs -t cat; exit 1)
+      make ${MAKEFLAGS} check || (find . -name test-suite.log | xargs -t cat; exit 1)
       llvm-cov gcov pick-pick.c
       bash <(curl -s https://codecov.io/bash)
       ;;