summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicent Marti <vicent@github.com>2014-09-16 17:46:32 +0200
committerVicent Marti <vicent@github.com>2014-09-16 17:46:32 +0200
commitecef28d55c7d72dda0e33649614f2b20db482cd6 (patch)
treeca9f132b165cf554c54efcb38ff94efe1f34ea66
parent73dd663876bbc070bdc0c062ba3e14448ed11c30 (diff)
parent570452e31a58ad58716887cea479b7c00fc4f02f (diff)
downloadlibgit2-ecef28d55c7d72dda0e33649614f2b20db482cd6.tar.gz
Merge pull request #2569 from libgit2/cmn/valgrind-once
travis: run valgrind only once
-rw-r--r--.travis.yml13
1 files changed, 10 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 362b88224..908a0f562 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: