From c041a7ab3b6daa75edf9e7fa07acc1422af41d44 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Fri, 1 Dec 2017 14:28:35 +0100
Subject: Run valgrind in the testsuite

- Install only what's necessary for different matrices
- Run valgrind only in one of the matrices
---
 .travis.yml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8b41631..4639d32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 language: php
 
-before_install:
-  - pip install --user cpp-coveralls
-  - if test ${TARGET} = "coverity"; then echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-; fi
-
+addons:
+  apt:
+    packages:
+    - valgrind
 
 env:
   - secure: "fjx/arfcdoqWUIzlQXzQdW9gqXRG7Vpo8dTwJip0uJH8oFeTfYhw1V9EMS4JtKVGwQo3vaagehMflVr7swaoe9Nf4YoCjaEq8x6ZMJH3bLHNgtigfS03Uqop9FI/a/Jau/BL7ibIEkZRNfEIx8z+NyfY4bAeK35W/Ru5k2BHyp1GLKwBpizHdJsshG/ukM+4W8PY9BAeXVavqxQRywseQEsqmGruGLcYFuuh04D7cnNqyuYgbdaq7YMKZfVGxM7N5eeL5xSlw0Sl9yOutRzkxUmL1WSmYMFrkRLcc37hRTu67tCmP60tiGLGY2Ll8nUh6rkc3RwBgc1wOC7jRMrtoGvlgsLxz7kLOtpQ31PdJKefe99rQMkcYKLwCxXf7WQdOHY4YsTmjqlPyzfTKT3mNtGhUwp1rEvlcygZZK8osHtc46BUD6BKNRCvTyLNyLTx2IoA4WfrzWOaQ+A1gNRD5L9Jbqi0kY6teENCzzlHUe80mH7wBarCTRoDAD73w/EPgSn3+CeLALXXEu+r9Sm/e5YpaFfLdeKDC6fr1KwU69ddHUKWZqjFM8vEHjrIbmAdNwVsuCo8LeWdCCXdQlWrISQ4OUDBBEmnwlKoojSjIYP5SKoH1txZemGok1/TN/tvjlyrx2RYYxy7AdUulENKXXeqlwWsiwVZCZLR4tt+wEQ="
@@ -14,6 +14,7 @@ matrix:
     php: nightly
     script: echo "Coverity, nothing to do."
     after_success: cat /home/travis/build/nbs-system/snuffleupagus/cov-int/scm_log.txt
+    before_install: echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
     addons:
       coverity_scan:
         project:
@@ -30,6 +31,7 @@ matrix:
   - env: TARGET="gcc php7.2" CC="gcc"
     php: '7.2'
   - env: TARGET="gcc php nightly" CC="gcc"
+    before_install: pip install --user cpp-coveralls
     php: nightly
   - env: TARGET="clang php7.0" CC="clang"
     php: '7.0'
@@ -37,7 +39,7 @@ matrix:
     php: '7.1'
   - env: TARGET="clang php7.2" CC="clang"
     php: '7.2'
-  - env: TARGET="clang php nightly" CC="clang"
+  - env: TARGET="clang php nightly with valgrind" CC="clang"
     php: nightly
 
 script:
@@ -45,10 +47,14 @@ script:
   - phpize
   - ./configure --enable-snuffleupagus --enable-coverage
   - make -j 2
-  - TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make test
+  - 'if [ "${TARGET}" = "clang php nightly with valgrind" ]; then
+      TEST_PHP_ARGS="-q -m" REPORT_EXIT_STATUS=1 make test ;
+    else
+      TEST_PHP_ARGS="-q"    REPORT_EXIT_STATUS=1 make test ;
+    fi'
 
 after_success:
-  - 'if [ ${CC} = "gcc" ]; then
+  - 'if [ "${TARGET}" = "gcc php nightly" ]; then
       git clone https://github.com/linux-test-project/lcov.git --depth 1 ;
       rm -rf ./lcov/examples/ ./lcov/test/ ;
       ./lcov/bin/lcov -c -o ./COV.info --rc lcov_branch_coverage=1 --base-directory . --directory . ;
-- 
cgit v1.3