Commit ecef28d55c7d72dda0e33649614f2b20db482cd6

Vicent Marti 2014-09-16T17:46:32

Merge pull request #2569 from libgit2/cmn/valgrind-once travis: run valgrind only once

diff --git a/.travis.yml b/.travis.yml
index 362b882..908a0f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,8 +31,15 @@ matrix:
    - compiler: gcc
      env: COVERITY=1
      os: linux
+   - compiler: gcc
+     env:
+       - VALGRIND=1
+         OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Debug"
+     os: linux
  allow_failures:
-   - env: COVERITY=1
+   - env:
+     - COVERITY=1
+       VALGRIND=1
 
 install:
   - ./script/install-deps-${TRAVIS_OS_NAME}.sh
@@ -43,8 +50,8 @@ script:
 
 # Run Tests
 after_success:
- - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install valgrind; fi
- - if [ "$TRAVIS_OS_NAME" = "linux" ]; then valgrind --leak-check=full --show-reachable=yes --suppressions=./libgit2_clar.supp _build/libgit2_clar -ionline; fi
+ - if [ "$TRAVIS_OS_NAME" = "linux" -a -n "$VALGRIND" ]; then sudo apt-get -qq install valgrind; fi
+ - if [ "$TRAVIS_OS_NAME" = "linux" -a -n "$VALGRIND" ]; then valgrind --leak-check=full --show-reachable=yes --suppressions=./libgit2_clar.supp _build/libgit2_clar -ionline; fi
 
 # Only watch the development and master branches
 branches: