Date: Wednesday, February 15, 2023 @ 13:23:05 Author: artafinde Revision: 1400649
upgpkg: mtxclient 0.9.1-2 Added: mtxclient/trunk/0.6.0_remove_network_tests.patch Modified: mtxclient/trunk/PKGBUILD ----------------------------------+ 0.6.0_remove_network_tests.patch | 89 +++++++++++++++++++++++++++++++++++++ PKGBUILD | 26 +++++++--- 2 files changed, 107 insertions(+), 8 deletions(-) Added: 0.6.0_remove_network_tests.patch =================================================================== --- 0.6.0_remove_network_tests.patch (rev 0) +++ 0.6.0_remove_network_tests.patch 2023-02-15 13:23:05 UTC (rev 1400649) @@ -0,0 +1,89 @@ +From 6fecee0d675e65b75d67c66218a7655cb285bb5c Mon Sep 17 00:00:00 2001 +From: tastytea <[email protected]> +Date: Sat, 23 Oct 2021 01:42:27 +0200 +Subject: [PATCH] Remove network tests. + +--- + CMakeLists.txt | 51 -------------------------------------------------- + 1 file changed, 51 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0d13a72..98c2782 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -360,36 +360,6 @@ if(BUILD_LIB_TESTS) + + file(COPY tests/fixtures DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + +- add_executable(client_api tests/client_api.cpp) +- target_link_libraries(client_api +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(client_api PRIVATE +- ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- +- add_executable(media_api tests/media_api.cpp) +- target_link_libraries(media_api +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(media_api PRIVATE +- ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- +- add_executable(e2ee tests/e2ee.cpp) +- target_link_libraries(e2ee +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(e2ee PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- +- add_executable(device tests/device.cpp) +- target_link_libraries(device +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(device PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- + add_executable(utils tests/utils.cpp) + target_link_libraries(utils + MatrixClient::MatrixClient +@@ -397,21 +367,6 @@ if(BUILD_LIB_TESTS) + GTest::Main) + target_include_directories(utils PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests) + +- add_executable(pushrules tests/pushrules.cpp) +- target_link_libraries(pushrules +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(pushrules PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- +- add_executable(connection tests/connection.cpp) +- target_link_libraries(connection +- MatrixClient::MatrixClient +- GTest::GTest +- GTest::Main) +- target_include_directories(connection PRIVATE +- ${CMAKE_CURRENT_SOURCE_DIR}/tests) +- + add_executable(identifiers tests/identifiers.cpp) + target_link_libraries(identifiers + MatrixClient::MatrixClient +@@ -454,13 +409,7 @@ if(BUILD_LIB_TESTS) + GTest::GTest + GTest::Main) + +- add_test(BasicConnectivity connection) +- add_test(ClientAPI client_api) +- add_test(MediaAPI media_api) +- add_test(Encryption e2ee) +- add_test(Devices device) + add_test(Utilities utils) +- add_test(Pushrules pushrules) + add_test(Identifiers identifiers) + add_test(Errors errors) + add_test(CryptoStructs crypto) +-- +2.32.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-02-15 13:17:49 UTC (rev 1400648) +++ PKGBUILD 2023-02-15 13:23:05 UTC (rev 1400649) @@ -10,14 +10,26 @@ license=('MIT') depends=(gcc-libs glibc) makedepends=(cmake coeurl fmt libolm meson nlohmann-json openssl re2 spdlog git) +checkdepends=(gmock gtest) provides=(libmatrix_client.so) -source=(git+https://github.com/Nheko-Reborn/mtxclient.git#tag=v${pkgver}) -sha256sums=('SKIP') +source=(git+https://github.com/Nheko-Reborn/mtxclient.git#tag=v${pkgver} + 0.6.0_remove_network_tests.patch) +sha256sums=('SKIP' + '2edba127593d172b5e535a4f0058d26a47a67f8b4c2d0cef9d6eac07e17eba3e') +b2sums=('SKIP' + 'af9e62223b59cfae2b711420944612a40d8ff7e87d188c3ccdb3a628310458df498cba70786bcb5cb35bce7e82940249ade31003e7418dcaa6c58cde33e6b25f') # validpgpkeys=('D58B462425A6A37125C6FEDB9206AE1B231E05BB') # Nicolas Werner @deepbluev7 https://nheko.im/deepbluev7.gpg # # Nicolas Werner <[email protected]> # # Nicolas Werner <[email protected]> # # Nicolas Werner <[email protected]> +prepare(){ + cd "$pkgname" + # https://github.com/Nheko-Reborn/mtxclient/issues/93 + patch -Np1 < "../0.6.0_remove_network_tests.patch" + git cherry-pick --no-commit 6daf21627c36704e28245e52ad525508ec5be51f +} + build() { cmake \ -Bbuild \ @@ -28,17 +40,15 @@ -DCMAKE_INSTALL_LIBDIR='lib' \ -DBUILD_LIB_EXAMPLES=OFF \ -DBUILD_SHARED_LIBS=ON \ - -DBUILD_LIB_TESTS=OFF \ + -DBUILD_LIB_TESTS=ON \ -DBUILD_LIB_EXAMPLES=OFF \ -Wno-dev cmake --build build --verbose } -# check() { -# # Tests require a synapse docker instance running and a commit so disable for now -# # git cherry-pick --no-commit 6daf21627c36704e28245e52ad525508ec5be51f -# ninja test -C build -# } +check() { + ninja test -C build +} package() { depends+=(
