Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorHannah von Reth <hannah.vonreth@owncloud.com>2020-01-09 17:40:54 +0300
committerHannah von Reth <vonreth@kde.org>2020-01-20 14:19:57 +0300
commit4a1e8202a0ee6b8ed9780464f6a2c059a00a7a85 (patch)
tree71e9991c49a5b66bca7bffbaacd41584cbddd4c1 /test
parent9a8288891c292bbb02bcff33647bd7fb3bbb2805 (diff)
[CMAKE] Use ecm for autotests
Diffstat (limited to 'test')
-rw-r--r--test/owncloud_add_test.cmake24
1 files changed, 10 insertions, 14 deletions
diff --git a/test/owncloud_add_test.cmake b/test/owncloud_add_test.cmake
index 2f75ae497..18d477115 100644
--- a/test/owncloud_add_test.cmake
+++ b/test/owncloud_add_test.cmake
@@ -1,26 +1,24 @@
find_package(Qt5 COMPONENTS Core Test Xml Network REQUIRED)
-macro(owncloud_add_test test_class additional_cpp)
+include(ECMAddTests)
+
+function(owncloud_add_test test_class additional_cpp)
set(OWNCLOUD_TEST_CLASS ${test_class})
string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE)
+ list(APPEND additional_cpp test${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp)
- add_executable(${OWNCLOUD_TEST_CLASS}Test test${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${additional_cpp})
- ecm_mark_nongui_executable(${OWNCLOUD_TEST_CLASS}Test)
-
- target_link_libraries(${OWNCLOUD_TEST_CLASS}Test
+ ecm_add_test("${additional_cpp}"
+ TEST_NAME "${OWNCLOUD_TEST_CLASS}Test"
+ LINK_LIBRARIES
updater
${APPLICATION_EXECUTABLE}sync
Qt5::Core Qt5::Test Qt5::Xml Qt5::Network
)
- add_definitions(-DOWNCLOUD_TEST)
- add_definitions(-DOWNCLOUD_BIN_PATH="${CMAKE_BINARY_DIR}/bin")
- add_test(NAME ${OWNCLOUD_TEST_CLASS}Test
- COMMAND ${OWNCLOUD_TEST_CLASS}Test
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+ target_compile_definitions(${OWNCLOUD_TEST_CLASS}Test PRIVATE OWNCLOUD_TEST OWNCLOUD_BIN_PATH="${CMAKE_BINARY_DIR}/bin")
target_include_directories(${OWNCLOUD_TEST_CLASS}Test PRIVATE "${CMAKE_SOURCE_DIR}/test/")
-endmacro()
+endfunction()
macro(owncloud_add_benchmark test_class additional_cpp)
set(OWNCLOUD_TEST_CLASS ${test_class})
@@ -34,7 +32,5 @@ macro(owncloud_add_benchmark test_class additional_cpp)
${APPLICATION_EXECUTABLE}sync
Qt5::Core Qt5::Test Qt5::Xml Qt5::Network
)
-
- add_definitions(-DOWNCLOUD_TEST)
- add_definitions(-DOWNCLOUD_BIN_PATH="${CMAKE_BINARY_DIR}/bin")
+ target_compile_definitions(${OWNCLOUD_TEST_CLASS}Bench PRIVATE OWNCLOUD_TEST OWNCLOUD_BIN_PATH="${CMAKE_BINARY_DIR}/bin")
endmacro()