From c94c36418461f0909f125d3833e323689c4357f8 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 2 Mar 2018 13:58:01 +0900 Subject: Travis CI: run qmc-example on OSX; set valgrind options externally The first part at least checks that qmc-example works on OSX (and we no more make a useless bundle for it). The second part allows to change valgrind options without tinkering .travis.yml. --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b75418f2..001ba11f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,15 +22,16 @@ matrix: before_install: - eval "${ENV_EVAL}" -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then . /opt/qt56/bin/qt56-env.sh; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then VALGRIND="valgrind $VALGRIND_OPTIONS"; . /opt/qt56/bin/qt56-env.sh; fi script: - mkdir build && cd build - cmake .. - cmake --build . --target all - cd .. -- qmake qmc-example.pro "CONFIG += debug" "QMAKE_CC = $CC" "QMAKE_CXX = $CXX" && make all -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then valgrind --tool=memcheck --leak-check=yes --show-reachable=yes ./qmc-example "$QMC_TEST_USER" "$QMC_TEST_PWD" '#qmc-test:matrix.org'; fi +- qmake qmc-example.pro "CONFIG += debug" "CONFIG -= app_bundle" "QMAKE_CC = $CC" "QMAKE_CXX = $CXX" +- make all +- $VALGRIND ./qmc-example "$QMC_TEST_USER" "$QMC_TEST_PWD" '#qmc-test:matrix.org' notifications: webhooks: -- cgit v1.2.3