diff options
| author | Linus Jahn <lnj@kaidan.im> | 2022-08-08 20:31:32 +0200 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2022-08-13 15:55:03 +0200 |
| commit | 87df8a8dda385558d39639ce09e2717974264ab6 (patch) | |
| tree | 75e60c982f90430a258ccaf9cc13e3291c85c2b7 /tests | |
| parent | ceb62dd9d0d86bc8327ace116930962cf7fad1e9 (diff) | |
| download | qxmpp-87df8a8dda385558d39639ce09e2717974264ab6.tar.gz | |
ci: Enable OMEMO for full+5.15 configs
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | tests/travis/build-and-test | 6 | ||||
| -rwxr-xr-x | tests/travis/install-build-depends | 29 |
3 files changed, 36 insertions, 1 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cf6def66..e71443da 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -76,7 +76,7 @@ if(WITH_GSTREAMER) add_simple_test(qxmppcallmanager) endif() -if(WITH_OMEMO) +if(BUILD_OMEMO) if(BUILD_INTERNAL_TESTS) add_simple_test(qxmppomemodata) endif() diff --git a/tests/travis/build-and-test b/tests/travis/build-and-test index 068b70be..400831d5 100755 --- a/tests/travis/build-and-test +++ b/tests/travis/build-and-test @@ -13,6 +13,12 @@ CMAKE_ARGS="-DBUILD_TESTS:BOOL=True" case "$CONFIG" in full*) CMAKE_ARGS="-DBUILD_DOCUMENTATION:BOOL=True -DBUILD_EXAMPLES:BOOL=True -DWITH_GSTREAMER:BOOL=True" + case "$QT_VERSION" in + 5.15*) + # Enable OMEMO + CMAKE_ARGS="$CMAKE_ARGS -DBUILD_OMEMO=ON" + ;; + esac ;; esac diff --git a/tests/travis/install-build-depends b/tests/travis/install-build-depends index df1b15fb..3fa14a28 100755 --- a/tests/travis/install-build-depends +++ b/tests/travis/install-build-depends @@ -7,6 +7,22 @@ set -e +install_cmake() { + NAME=$1 + URL=$2 + OPTS=$3 + CURRENT_DIR=$(pwd) + + cd + git clone $URL $NAME + mkdir -p $NAME-build + cmake $NAME -B./$NAME-build/ -DCMAKE_BUILD_TYPE=Release $OPTS + cmake --build $NAME-build --parallel + sudo cmake --build $NAME-build --target install + + cd $CURRENT_DIR +} + if [ "$(uname -s)" = "Darwin" ]; then brew update brew unlink python@3 @@ -28,3 +44,16 @@ else ;; esac fi + +case "$CONFIG" in +full*) + case "$QT_VERSION" in + 5.15*) + # OMEMO enabled + # Build and install qca and libomemo-c + install_cmake libomemo-c https://github.com/dino/libomemo-c "-DBUILD_SHARED_LIBS=ON" + install_cmake qca https://invent.kde.org/libraries/qca "-DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DBUILD_WITH_QT6=OFF" + ;; + esac + ;; +esac |