diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2015-09-03 16:34:36 +0200 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2015-09-03 16:34:36 +0200 |
| commit | cb16b3abb805c02c103237155e2ee624325f5dd6 (patch) | |
| tree | 4e52159289e6048f07b5d079ef2eaa70e2e2f73e /tests/travis | |
| parent | aa3e0a2d41f25b05aef08df3d8b8cf698e9045c8 (diff) | |
| parent | a159e4c4afc62628ec5b753829e1a023b6ae5dea (diff) | |
| download | qxmpp-cb16b3abb805c02c103237155e2ee624325f5dd6.tar.gz | |
Merge branch 'master' of github.com:qxmpp-project/qxmpp
Diffstat (limited to 'tests/travis')
| -rwxr-xr-x | tests/travis/build-and-test | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/tests/travis/build-and-test b/tests/travis/build-and-test index 64a7a730..2f51f4de 100755 --- a/tests/travis/build-and-test +++ b/tests/travis/build-and-test @@ -1,7 +1,7 @@ #!/bin/sh set -e -QMAKE_ARGS="QXMPP_PROFILE=true" +QMAKE_ARGS="" if [ -n "$CC" ]; then QMAKE_ARGS="$QMAKE_ARGS QMAKE_CC=$CC" @@ -14,12 +14,18 @@ fi case "$CONFIG" in full*) - QMAKE_ARGS="$QMAKE_ARGS QXMPP_USE_DOXYGEN=1 QXMPP_USE_OPUS=1 QXMPP_USE_SPEEX=1 QXMPP_USE_THEORA=1" + QMAKE_ARGS="$QMAKE_ARGS QXMPP_USE_DOXYGEN=1 QXMPP_USE_OPUS=1 QXMPP_USE_SPEEX=1 QXMPP_USE_THEORA=1 QXMPP_USE_VPX=1" ;; esac case "$CONFIG" in -*static) +*debug*) + QMAKE_ARGS="$QMAKE_ARGS CONFIG+=debug" + ;; +esac + +case "$CONFIG" in +*static*) QMAKE_ARGS="$QMAKE_ARGS QXMPP_LIBRARY_TYPE=staticlib" ;; esac @@ -30,15 +36,3 @@ make VERBOSE=1 # run tests make check -exit 0 - -# generate coverage report -TRACEFILE=coverage.info -rm -f $TRACEFILE -lcov --capture --directory src -o $TRACEFILE --no-external -lcov --remove $TRACEFILE \*moc_\* -o $TRACEFILE.clean -mv $TRACEFILE.clean $TRACEFILE - -rm -rf coverage -genhtml -o coverage $TRACEFILE -echo "ok" |