aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2018-03-03 20:19:02 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2018-03-03 20:19:02 +0900
commit2285d147ab673dc8a561624fd7d90ae685a93e02 (patch)
tree3c65794bc8cae11fae93f6f91ed4d26c9f6e859c
parentfa5a91b92c3b397c2959c78aaa2fd023d0cfea2a (diff)
parentc94c36418461f0909f125d3833e323689c4357f8 (diff)
downloadlibquotient-2285d147ab673dc8a561624fd7d90ae685a93e02.tar.gz
libquotient-2285d147ab673dc8a561624fd7d90ae685a93e02.zip
Merge branch 'ci-tweaks'
-rw-r--r--.travis.yml7
1 files 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: