diff options
| author | Niels Ole Salscheider <niels_ole@salscheider-online.de> | 2017-09-04 13:16:26 +0200 |
|---|---|---|
| committer | Niels Ole Salscheider <niels_ole@salscheider-online.de> | 2017-09-04 20:34:53 +0200 |
| commit | 2be36c7d3a4eed9f731038f4ff335281a0790b32 (patch) | |
| tree | 0615e076789feb089b6204495ed68517a7ecf045 /tests | |
| parent | 77d52eb507474ae5a2c1b2f540e3c67945eaea37 (diff) | |
| download | qxmpp-2be36c7d3a4eed9f731038f4ff335281a0790b32.tar.gz | |
Update travis scripts
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/travis/build-and-test | 32 | ||||
| -rwxr-xr-x | tests/travis/install-build-depends | 7 |
2 files changed, 7 insertions, 32 deletions
diff --git a/tests/travis/build-and-test b/tests/travis/build-and-test index 3d6ad4cd..64957ba6 100755 --- a/tests/travis/build-and-test +++ b/tests/travis/build-and-test @@ -1,43 +1,23 @@ #!/bin/sh set -e -QMAKE_ARGS="" - -if [ -n "$CC" ]; then - QMAKE_ARGS="$QMAKE_ARGS QMAKE_CC=$CC" -fi - - -if [ -n "$CXX" ]; then - QMAKE_ARGS="$QMAKE_ARGS QMAKE_CXX=$CXX" -fi - -if [ "$CXX" = "clang++" ]; then - QMAKE_ARGS="$QMAKE_ARGS QMAKE_LINK=clang++" - QMAKE_ARGS="$QMAKE_ARGS QMAKE_LINK_SHLIB=clang++" -fi +CMAKE_ARGS="-DBUILD_TESTS:BOOL=True" case "$CONFIG" in full*) - QMAKE_ARGS="$QMAKE_ARGS QXMPP_USE_DOXYGEN=1 QXMPP_USE_OPUS=1 QXMPP_USE_SPEEX=1 QXMPP_USE_THEORA=1 QXMPP_USE_VPX=1" + CMAKE_ARGS="-DBUILD_DOCUMENTATION:BOOL=True -DBUILD_EXAMPLES:BOOL=True -DWITH_OPUS:BOOL=True -DWITH_SPEEX:BOOL=True -DWITH_THEORA:BOOL=True -DWITH_VPX:BOOL=True" ;; esac case "$CONFIG" in *debug*) - QMAKE_ARGS="$QMAKE_ARGS CONFIG+=debug" - ;; -esac - -case "$CONFIG" in -*static*) - QMAKE_ARGS="$QMAKE_ARGS QXMPP_LIBRARY_TYPE=staticlib" + CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=Debug" ;; esac # compile -qmake $QMAKE_ARGS -make VERBOSE=1 +cmake $CMAKE_ARGS +make # run tests -make check +make test diff --git a/tests/travis/install-build-depends b/tests/travis/install-build-depends index 2ea9a282..f735d816 100755 --- a/tests/travis/install-build-depends +++ b/tests/travis/install-build-depends @@ -2,12 +2,7 @@ set -e sudo apt-get update -qq - -if [ "$QT_SELECT" = "qt4" ]; then - sudo apt-get install -qq libqt4-dev -else - sudo apt-get install -qq qtbase5-dev -fi +sudo apt-get install -qq qtbase5-dev cmake case "$CONFIG" in full*) |