tweak

daviddrysdale · Nov 4, 2015 · 0b5c52a · 0b5c52a
1 parent efb71d9
commit 0b5c52a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,8 @@ syntax: glob
 *.exe
 *.obj
 *.dll
+*.gcno
+*.gcda
 
 Makefile
 CMakeCache.txt

diff --git a/.travis.yml b/.travis.yml
@@ -34,9 +34,9 @@ matrix:
         - os: linux
           compiler: clang
           env: BUILD_TYPE=ubsan tbs_arch=x64
-#       - os: linux
-#         compiler: clang
-#         env: BUILD_TYPE=asan tbs_arch=x64
+        - os: linux
+          compiler: clang
+          env: BUILD_TYPE=asan tbs_arch=x64
         - os: linux
           compiler: gcc
           env: BUILD_TYPE=coverage tbs_arch=x64
@@ -68,17 +68,15 @@ before_install:
         sudo apt-get -y install gcc-multilib;
         sudo apt-get -y install g++-multilib;
       fi;
+      pip install --user 'requests[security]';
+      pip install --user cpp-coveralls;
     fi
 
   - if [ "$TRAVIS_OS_NAME" = "osx" ];
     then
       brew install nasm;
     fi
 
-install:
-  - pip install --user 'requests[security]'
-  - pip install --user cpp-coveralls
-
 before_script:
   - if [ "$TRAVIS_OS_NAME" = "linux" ];
     then
@@ -107,7 +105,7 @@ script:
       grep WEBP src/config.h;
       make;
       nm src/gd_webp.o;
-      make check || true;
+      make check;
     fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ];
     then
@@ -116,7 +114,7 @@ script:
     fi
   - if [ "$BUILD_TYPE" = "coverage" ];
     then
-      cpp-coveralls --gcov-options '\-lp';
+      cpp-coveralls --exclude tests --gcov-options '\-lp';
     fi
 
 addons: