X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=.travis.yml;h=ec65a2d31ca473cc0ac5531be26bacd8100f9fa7;hp=83b3e0348010f93486d5d0d787fe7d2b8fa61781;hb=9788cfa5e3cac958a8c4f9e56343c27e396bc8f2;hpb=7c0c66b2db3098929b0562ee0926db11e7036f3e

diff --git a/.travis.yml b/.travis.yml
index 83b3e034..ec65a2d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,12 @@ os: linux
 language: generic  # No host compilation
 
 env:
-  - DIST=xenial CXX=g++
-  - DIST=xenial CXX=clang++
+  - DIST=xenial CXX=g++     CMAKE_OPTIONS="-DWITH_KDE=OFF -DWITH_WEBKIT=ON"
+  - DIST=xenial CXX=g++     CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBKIT=ON"
+  - DIST=xenial CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=OFF -DWITH_WEBKIT=ON"
+  - DIST=xenial CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBKIT=ON"
+  - DIST=bionic CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=OFF -DWITH_WEBENGINE=ON"
+  - DIST=bionic CXX=clang++ CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBENGINE=ON"
 
 # Set up cache
 cache:
@@ -33,10 +37,13 @@ script:
                -e CCACHE_DIR=/ccache \
                -e CXX=$CXX \
                quassel/quassel-build-env:$DIST \
-               sh -c "cmake -GNinja /src \
+               sh -c "cmake /src $CMAKE_OPTIONS \
+                            -GNinja \
                             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+                            -DBUILD_TESTING=ON \
                       && ninja install \
                       && ccache -s \
+                      && ninja test \
                      "
 
 # Define a separate job for OSX
@@ -60,9 +67,10 @@ jobs:
           if [[ "$TRAVIS_TAG" != "" && "$GH_TOKEN" != "" ]]; then
             DEPLOY=ON
           fi
-          cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DDEPLOY=$DEPLOY
+          cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DDEPLOY=$DEPLOY
           ninja install
         - ccache -s
+        - ninja test
       deploy:
         provider: releases
         api_key: "${GH_TOKEN}"