diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | tests/travis/build-and-test.sh | 17 |
2 files changed, 16 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 899bb6e3..b76b97ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,13 @@ compiler: - clang env: - QT_SELECT=qt4 ; CONFIG=minimal + - QT_SELECT=qt4 ; CONFIG=minimal-static - QT_SELECT=qt4 ; CONFIG=full + - QT_SELECT=qt4 ; CONFIG=full-static - QT_SELECT=qt5 ; CONFIG=minimal + - QT_SELECT=qt5 ; CONFIG=minimal-static - QT_SELECT=qt5 ; CONFIG=full + - QT_SELECT=qt5 ; CONFIG=full-static install: - tests/travis/install-build-depends.sh script: diff --git a/tests/travis/build-and-test.sh b/tests/travis/build-and-test.sh index 28932c0e..70a83b39 100755 --- a/tests/travis/build-and-test.sh +++ b/tests/travis/build-and-test.sh @@ -3,12 +3,19 @@ BUILD_FLAGS="QMAKE_CXXFLAGS += '-O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2'" \ "QMAKE_LFLAGS += '-Wl,-z,relro -Wl,--as-needed'" -if [ "$CONFIG" = "full" ]; then - qmake $BUILD_FLAGS QXMPP_USE_SPEEX=1 QXMPP_USE_THEORA=1 -else - qmake $BUILD_FLAGS QXMPP_USE_SPEEX="" QXMPP_USE_THEORA="" -fi +case "$CONFIG" in +full*) + BUILD_FLAGS="$BUILD_FLAGS QXMPP_USE_SPEEX=1 QXMPP_USE_THEORA=1" + ;; +esac +case "$CONFIG" in +*static) + BUILD_FLAGS="$BUILD_FLAGS QXMPP_LIBRARY_TYPE=staticlib" + ;; +esac + +qmake $BUILD_FLAGS make VERBOSE=1 tests/run.py |