From 527db6783b933e5cd3eca5849d48f4748e26fd41 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 23 Oct 2024 14:20:26 +0200 Subject: [PATCH] [cmake] split tests * Keep BUILD_TESTING, but only run tests compatible with API (for packaging) * Add BUILD_TESTING_INTERNAL for all tests including internal function tests that modify API to be run on our CI --- CMakeLists.txt | 30 ++++++------- channels/rdpear/common/CMakeLists.txt | 2 +- channels/rdpear/common/test/CMakeLists.txt | 9 +++- ci/cmake-preloads/config-linux-all.txt | 3 +- ci/cmake-preloads/config-macosx.txt | 2 +- ci/cmake-preloads/config-oss-fuzz.cmake | 2 +- ci/cmake-preloads/config-qa.cmake | 2 +- ci/cmake-preloads/config-ubuntu-1204.txt | 2 +- ci/cmake-preloads/config-windows.txt | 2 +- client/SDL/SDL2/dialogs/CMakeLists.txt | 2 +- client/SDL/common/CMakeLists.txt | 2 +- client/common/CMakeLists.txt | 2 +- cmake/ConfigOptions.cmake | 9 ++-- libfreerdp/codec/CMakeLists.txt | 2 +- libfreerdp/codec/test/CMakeLists.txt | 40 ++++++++++-------- libfreerdp/common/CMakeLists.txt | 2 +- libfreerdp/core/CMakeLists.txt | 2 +- libfreerdp/core/streamdump.c | 4 +- libfreerdp/core/streamdump.h | 6 +-- libfreerdp/core/test/CMakeLists.txt | 35 +++++++++------- libfreerdp/core/test/TestSettings.c | 4 ++ libfreerdp/crypto/CMakeLists.txt | 2 +- libfreerdp/crypto/test/CMakeLists.txt | 24 +++++++---- libfreerdp/gdi/CMakeLists.txt | 2 +- libfreerdp/locale/CMakeLists.txt | 2 +- libfreerdp/locale/test/CMakeLists.txt | 44 ++++++++++---------- libfreerdp/primitives/CMakeLists.txt | 2 +- libfreerdp/utils/CMakeLists.txt | 2 +- rdtk/CMakeLists.txt | 2 +- rdtk/librdtk/CMakeLists.txt | 2 +- rdtk/templates/CMakeLists.txt | 2 +- uwac/CMakeLists.txt | 2 +- uwac/libuwac/CMakeLists.txt | 2 +- uwac/templates/CMakeLists.txt | 2 +- winpr/CMakeLists.txt | 2 +- winpr/libwinpr/clipboard/CMakeLists.txt | 2 +- winpr/libwinpr/clipboard/test/CMakeLists.txt | 21 ++++++---- winpr/libwinpr/comm/CMakeLists.txt | 2 +- winpr/libwinpr/crt/CMakeLists.txt | 2 +- winpr/libwinpr/crypto/CMakeLists.txt | 2 +- winpr/libwinpr/dsparse/CMakeLists.txt | 2 +- winpr/libwinpr/environment/CMakeLists.txt | 2 +- winpr/libwinpr/error/CMakeLists.txt | 2 +- winpr/libwinpr/file/CMakeLists.txt | 2 +- winpr/libwinpr/interlocked/CMakeLists.txt | 2 +- winpr/libwinpr/io/CMakeLists.txt | 2 +- winpr/libwinpr/library/CMakeLists.txt | 2 +- winpr/libwinpr/memory/CMakeLists.txt | 2 +- winpr/libwinpr/ncrypt/CMakeLists.txt | 2 +- winpr/libwinpr/nt/CMakeLists.txt | 2 +- winpr/libwinpr/path/CMakeLists.txt | 2 +- winpr/libwinpr/pipe/CMakeLists.txt | 2 +- winpr/libwinpr/pool/CMakeLists.txt | 2 +- winpr/libwinpr/security/CMakeLists.txt | 2 +- winpr/libwinpr/smartcard/CMakeLists.txt | 2 +- winpr/libwinpr/sspi/CMakeLists.txt | 2 +- winpr/libwinpr/synch/CMakeLists.txt | 2 +- winpr/libwinpr/sysinfo/CMakeLists.txt | 2 +- winpr/libwinpr/thread/CMakeLists.txt | 2 +- winpr/libwinpr/utils/CMakeLists.txt | 2 +- winpr/libwinpr/wtsapi/CMakeLists.txt | 2 +- 61 files changed, 181 insertions(+), 146 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd16e9ee2..ea5a2513d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,14 +189,14 @@ endif(CMAKE_CROSSCOMPILING) # Turn on solution folders (2.8.4+) set_property(GLOBAL PROPERTY USE_FOLDERS ON) -option(EXPORT_ALL_SYMBOLS "Export all symbols form library" OFF) - -if(BUILD_TESTING) - set(EXPORT_ALL_SYMBOLS TRUE) - set(CTEST_OUTPUT_ON_FAILURE TRUE) - add_definitions(-DBUILD_TESTING) -elseif(NOT DEFINED EXPORT_ALL_SYMBOLS) - set(EXPORT_ALL_SYMBOLS FALSE) +option(CTEST_OUTPUT_ON_FAILURE ON "show verbose output on CTest failures") +if(BUILD_TESTING_INTERNAL) + set(EXPORT_ALL_SYMBOLS ON CACHE BOOL "testing default" FORCE) + add_definitions(-DBUILD_TESTING_INTERNAL) +elseif(BUILD_TESTING) + set(EXPORT_ALL_SYMBOLS OFF CACHE BOOL "testing default" FORCE) +else() + option(EXPORT_ALL_SYMBOLS "Export all symbols form library" OFF) endif() if (EXPORT_ALL_SYMBOLS) @@ -547,7 +547,7 @@ find_feature(Wayland ${WAYLAND_FEATURE_TYPE} ${WAYLAND_FEATURE_PURPOSE} ${WAYLAN option(WITH_LIBRESSL "build with LibreSSL" OFF) if (WITH_LIBRESSL) find_package(LibreSSL REQUIRED) - include_directories(SYSTEM ${LibreSSL_INCLUDE_DIRS}) + include_directories(SYSTEM ${LibreSSL_INCLUDE_DIRS}) set(OPENSSL_INCLUDE_DIR ${LIBRESSL_INCLUDE_DIR}) set(OPENSSL_LIBRARIES ${LIBRESSL_LIBRARIES}) set(OPENSSL_CRYPTO_LIBRARIES ${LIBRESSL_LIBRARIES}) @@ -595,7 +595,7 @@ set(WITH_OPENH264 ${OPENH264_FOUND}) if(OPENSSL_FOUND) add_definitions("-DWITH_OPENSSL") message(STATUS "Using OpenSSL Version: ${OPENSSL_VERSION}") - include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR}) + include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR}) endif() if(MBEDTLS_FOUND) @@ -657,7 +657,7 @@ if(ANDROID) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg") set(PROFILER_LIBRARIES "${FREERDP_EXTERNAL_PROFILER_PATH}/obj/local/${ANDROID_ABI}/libandroid-ndk-profiler.a") - include_directories(SYSTEM "${FREERDP_EXTERNAL_PROFILER_PATH}") + include_directories(SYSTEM "${FREERDP_EXTERNAL_PROFILER_PATH}") endif() endif() @@ -665,7 +665,7 @@ endif() include(CTest) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) enable_testing() if(MSVC) @@ -693,7 +693,7 @@ if (FREERDP_UNIFIED_BUILD) include_directories(${PROJECT_BINARY_DIR}/winpr/include) else() find_package(WinPR 3 REQUIRED) - include_directories(SYSTEM ${WinPR_INCLUDE_DIR}) + include_directories(SYSTEM ${WinPR_INCLUDE_DIR}) endif() option(WITH_AAD "Compile with support for Azure AD authentication" ${WITH_WINPR_JSON}) @@ -708,7 +708,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) if(WITH_THIRD_PARTY) add_subdirectory(third-party) if (NOT "${THIRD_PARTY_INCLUDES}" STREQUAL "") - include_directories(SYSTEM ${THIRD_PARTY_INCLUDES}) + include_directories(SYSTEM ${THIRD_PARTY_INCLUDES}) endif() endif() @@ -744,7 +744,7 @@ endif() set(FREERDP_BUILD_CONFIG_LIST "") GET_CMAKE_PROPERTY(res VARIABLES) FOREACH(var ${res}) - IF (var MATCHES "^WITH_*|^BUILD_TESTING|^WINPR_HAVE_*") + IF (var MATCHES "^WITH_*|^BUILD_TESTING*|^WINPR_HAVE_*") LIST(APPEND FREERDP_BUILD_CONFIG_LIST "${var}=${${var}}") ENDIF() ENDFOREACH() diff --git a/channels/rdpear/common/CMakeLists.txt b/channels/rdpear/common/CMakeLists.txt index c6915d3d5..53ea034c4 100644 --- a/channels/rdpear/common/CMakeLists.txt +++ b/channels/rdpear/common/CMakeLists.txt @@ -53,6 +53,6 @@ target_link_libraries(rdpear-common INTERFACE channel_install(rdpear-common ${FREERDP_ADDIN_PATH} "FreeRDPTargets") -if (BUILD_TESTING) +if (BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/channels/rdpear/common/test/CMakeLists.txt b/channels/rdpear/common/test/CMakeLists.txt index 1d834ce9f..ce0c4cb23 100644 --- a/channels/rdpear/common/test/CMakeLists.txt +++ b/channels/rdpear/common/test/CMakeLists.txt @@ -7,10 +7,15 @@ set(TEST_RDPEAR_DRIVER TestRdpear.c) disable_warnings_for_directory(${CMAKE_CURRENT_BINARY_DIR}) set(TEST_RDPEAR_TESTS - TestNdr.c - TestNdrEar.c + TestNdr.c ) +if (BUILD_TESTING_INTERNAL) + list(APPEND TEST_RDPEAR_TESTS + TestNdrEar.c + ) +endif() + create_test_sourcelist(TEST_RDPEAR_SRCS TestRdpear.c ${TEST_RDPEAR_TESTS} diff --git a/ci/cmake-preloads/config-linux-all.txt b/ci/cmake-preloads/config-linux-all.txt index a9ac92270..262d9ff82 100644 --- a/ci/cmake-preloads/config-linux-all.txt +++ b/ci/cmake-preloads/config-linux-all.txt @@ -1,9 +1,8 @@ message("PRELOADING cache") set (CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "preload") -set (BUILD_TESTING ON CACHE BOOL "preload") +set (BUILD_TESTING_INTERNAL ON CACHE BOOL "preload") set (WITH_MANPAGES ON CACHE BOOL "preload") set (CMAKE_BUILD_TYPE "preload" CACHE STRING "preload") -set (BUILD_TESTING ON CACHE BOOL "preload") set (WITH_PULSE ON CACHE BOOL "preload") set (WITH_CHANNELS ON CACHE BOOL "preload") set (WITH_CUPS ON CACHE BOOL "preload") diff --git a/ci/cmake-preloads/config-macosx.txt b/ci/cmake-preloads/config-macosx.txt index 3282118cd..3cfed2251 100644 --- a/ci/cmake-preloads/config-macosx.txt +++ b/ci/cmake-preloads/config-macosx.txt @@ -7,7 +7,7 @@ set (CHANNEL_URBDRC OFF CACHE BOOL "USB redirection") set (WITH_X11 ON CACHE BOOL "Enable X11") set (WITH_SERVER ON CACHE BOOL "build with server") set (WITH_SAMPLE ON CACHE BOOL "build with sample") -set (BUILD_TESTING ON CACHE BOOL "build testing") +set (BUILD_TESTING_INTERNAL ON CACHE BOOL "build testing") set (WITH_SANITIZE_ADDRESS ON CACHE BOOL "build with address sanitizer") set (WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated command line options") set (WITH_KRB5 OFF CACHE BOOL "Kerberos support") diff --git a/ci/cmake-preloads/config-oss-fuzz.cmake b/ci/cmake-preloads/config-oss-fuzz.cmake index 08248b11b..36c182a36 100644 --- a/ci/cmake-preloads/config-oss-fuzz.cmake +++ b/ci/cmake-preloads/config-oss-fuzz.cmake @@ -25,4 +25,4 @@ set (BUILD_SHARED_LIBS OFF CACHE BOOL "oss fuzz") set (BUILD_WITH_CLANG_TIDY OFF CACHE BOOL "oss fuzz") set (OSS_FUZZ ON CACHE BOOL "oss fuzz") set (BUILD_FUZZERS ON CACHE BOOL "oss fuzz") -set (BUILD_TESTING ON CACHE BOOL "oss fuzz") +set (BUILD_TESTING_INTERNAL ON CACHE BOOL "oss fuzz") diff --git a/ci/cmake-preloads/config-qa.cmake b/ci/cmake-preloads/config-qa.cmake index 4b5ac5667..7686da851 100644 --- a/ci/cmake-preloads/config-qa.cmake +++ b/ci/cmake-preloads/config-qa.cmake @@ -1,4 +1,4 @@ -set (BUILD_TESTING ON CACHE BOOL "qa default") +set (BUILD_TESTING_INTERNAL ON CACHE BOOL "qa default") set (CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "preload") set (ENABLE_WARNING_VERBOSE ON CACHE BOOL "preload") set (WITH_MANPAGES ON CACHE BOOL "qa default") diff --git a/ci/cmake-preloads/config-ubuntu-1204.txt b/ci/cmake-preloads/config-ubuntu-1204.txt index efe1faec0..0a6f85ecc 100644 --- a/ci/cmake-preloads/config-ubuntu-1204.txt +++ b/ci/cmake-preloads/config-ubuntu-1204.txt @@ -7,7 +7,7 @@ set (WITH_KRB5 ON CACHE BOOL "Kerberos support") set (WITH_ALSA OFF CACHE BOOL "alsa audio") set (WITH_FFMPEG OFF CACHE BOOL "ffmepg support") set (WITH_XV OFF CACHE BOOL "xvideo support") -set (BUILD_TESTING ON CACHE BOOL "build testing") +set (BUILD_TESTING_INTERNAL ON CACHE BOOL "build testing") set (WITH_XSHM OFF CACHE BOOL "build with xshm support") set (WITH_SERVER ON CACHE BOOL "build with server") set (WITH_SAMPLE ON CACHE BOOL "build with sample") diff --git a/ci/cmake-preloads/config-windows.txt b/ci/cmake-preloads/config-windows.txt index 8b18697cd..66462b22b 100644 --- a/ci/cmake-preloads/config-windows.txt +++ b/ci/cmake-preloads/config-windows.txt @@ -12,7 +12,7 @@ set (WITH_PLATFORM_SERVER OFF CACHE BOOL "Do not build platform server") set (WITH_CLIENT_SDL ON CACHE BOOL "build with SDL client") set (WITH_PROXY_MODULES "ON" CACHE BOOL "build proxy modules") set (CHANNEL_URBDRC OFF CACHE BOOL "USB redirection") -set (BUILD_TESTING ON CACHE BOOL "build testing") +set (BUILD_TESTING_INTERNAL ON CACHE BOOL "build testing") set (WITH_FFMPEG OFF CACHE BOOL "ci default") set (WITH_SWSCALE OFF CACHE BOOL "ci default") set (WITH_WEBVIEW ON CACHE BOOL "ci default") diff --git a/client/SDL/SDL2/dialogs/CMakeLists.txt b/client/SDL/SDL2/dialogs/CMakeLists.txt index 8db167518..bba708c66 100644 --- a/client/SDL/SDL2/dialogs/CMakeLists.txt +++ b/client/SDL/SDL2/dialogs/CMakeLists.txt @@ -70,6 +70,6 @@ add_library(sdl2-dialogs STATIC target_link_libraries(sdl2-dialogs PRIVATE ${LIBS}) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) # add_subdirectory(test) endif() diff --git a/client/SDL/common/CMakeLists.txt b/client/SDL/common/CMakeLists.txt index d19bdc152..81d3c0e6c 100644 --- a/client/SDL/common/CMakeLists.txt +++ b/client/SDL/common/CMakeLists.txt @@ -26,6 +26,6 @@ add_library(sdl-common-prefs STATIC ) target_link_libraries(sdl-common-prefs winpr freerdp) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt index 90781cb82..35eed4e92 100644 --- a/client/common/CMakeLists.txt +++ b/client/common/CMakeLists.txt @@ -81,7 +81,7 @@ install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDP-ClientTargets set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Common") -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake index c4b4e4dd9..358ff685a 100644 --- a/cmake/ConfigOptions.cmake +++ b/cmake/ConfigOptions.cmake @@ -51,9 +51,10 @@ if(WIN32 AND NOT UWP) option(WITH_WIN8 "Use Windows 8 libraries" OFF) endif() -option(BUILD_TESTING "Build unit tests" OFF) -CMAKE_DEPENDENT_OPTION(TESTS_WTSAPI_EXTRA "Build extra WTSAPI tests (interactive)" OFF "BUILD_TESTING" OFF) -CMAKE_DEPENDENT_OPTION(BUILD_COMM_TESTS "Build comm related tests (require comm port)" OFF "BUILD_TESTING" OFF) +option(BUILD_TESTING "Build unit tests (compatible with packaging)" OFF) +CMAKE_DEPENDENT_OPTION(BUILD_TESTING_INTERNAL "Build unit tests (CI only, not for packaging!)" OFF "NOT BUILD_TESTING" OFF) +CMAKE_DEPENDENT_OPTION(TESTS_WTSAPI_EXTRA "Build extra WTSAPI tests (interactive)" OFF "BUILD_TESTING_INTERNAL" OFF) +CMAKE_DEPENDENT_OPTION(BUILD_COMM_TESTS "Build comm related tests (require comm port)" OFF "BUILD_TESTING_INTERNAL" OFF) option(WITH_SAMPLE "Build sample code" ON) @@ -205,7 +206,7 @@ if (BUILD_FUZZERS) "\n") endif () - set(BUILD_TESTING ON) + set(BUILD_TESTING_INTERNAL ON CACHE BOOL "fuzzer default" FORCE) if (BUILD_SHARED_LIBS STREQUAL "OFF") set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") diff --git a/libfreerdp/codec/CMakeLists.txt b/libfreerdp/codec/CMakeLists.txt index da2123b89..0f1ad4bff 100644 --- a/libfreerdp/codec/CMakeLists.txt +++ b/libfreerdp/codec/CMakeLists.txt @@ -160,6 +160,6 @@ add_library(freerdp-codecs OBJECT freerdp_library_add(${CODEC_LIBS}) freerdp_object_library_add(freerdp-codecs) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/libfreerdp/codec/test/CMakeLists.txt b/libfreerdp/codec/test/CMakeLists.txt index 3b02a3dfc..971360980 100644 --- a/libfreerdp/codec/test/CMakeLists.txt +++ b/libfreerdp/codec/test/CMakeLists.txt @@ -4,34 +4,40 @@ set(MODULE_PREFIX "TEST_FREERDP_CODEC") disable_warnings_for_directory(${CMAKE_CURRENT_BINARY_DIR}) -set(${MODULE_PREFIX}_DRIVER ${MODULE_NAME}.c) +set(DRIVER ${MODULE_NAME}.c) -set(${MODULE_PREFIX}_TESTS - TestFreeRDPRegion.c - TestFreeRDPCodecMppc.c - TestFreeRDPCodecNCrush.c - TestFreeRDPCodecXCrush.c - TestFreeRDPCodecZGfx.c - TestFreeRDPCodecPlanar.c +set(TESTS + TestFreeRDPRegion.c + TestFreeRDPCodecZGfx.c + TestFreeRDPCodecPlanar.c TestFreeRDPCodecCopy.c - TestFreeRDPCodecClear.c - TestFreeRDPCodecInterleaved.c - TestFreeRDPCodecProgressive.c - TestFreeRDPCodecRemoteFX.c) + TestFreeRDPCodecClear.c + TestFreeRDPCodecInterleaved.c + TestFreeRDPCodecProgressive.c + TestFreeRDPCodecRemoteFX.c +) -create_test_sourcelist(${MODULE_PREFIX}_SRCS - ${${MODULE_PREFIX}_DRIVER} - ${${MODULE_PREFIX}_TESTS}) +if (BUILD_TESTING_INTERNAL) + list(APPEND TESTS + TestFreeRDPCodecMppc.c + TestFreeRDPCodecNCrush.c + TestFreeRDPCodecXCrush.c + ) +endif() + +create_test_sourcelist(SRCS + ${DRIVER} + ${TESTS}) add_definitions(-DCMAKE_CURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}") add_definitions(-DCMAKE_CURRENT_BINARY_DIR="${CMAKE_CURRENT_BINARY_DIR}") -add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) +add_executable(${MODULE_NAME} ${SRCS}) target_link_libraries(${MODULE_NAME} freerdp winpr) set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}") -foreach(test ${${MODULE_PREFIX}_TESTS}) +foreach(test ${TESTS}) get_filename_component(TestName ${test} NAME_WE) add_test(${TestName} ${TESTING_OUTPUT_DIRECTORY}/${MODULE_NAME} ${TestName}) endforeach() diff --git a/libfreerdp/common/CMakeLists.txt b/libfreerdp/common/CMakeLists.txt index 36cda879d..b8b4fe9b3 100644 --- a/libfreerdp/common/CMakeLists.txt +++ b/libfreerdp/common/CMakeLists.txt @@ -28,6 +28,6 @@ set(${MODULE_PREFIX}_SRCS freerdp_module_add(${${MODULE_PREFIX}_SRCS}) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/libfreerdp/core/CMakeLists.txt b/libfreerdp/core/CMakeLists.txt index a576e5e36..5b384360f 100644 --- a/libfreerdp/core/CMakeLists.txt +++ b/libfreerdp/core/CMakeLists.txt @@ -159,6 +159,6 @@ endif() freerdp_library_add(${OPENSSL_LIBRARIES}) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/libfreerdp/core/streamdump.c b/libfreerdp/core/streamdump.c index 12a1fe9ff..e94cc5674 100644 --- a/libfreerdp/core/streamdump.c +++ b/libfreerdp/core/streamdump.c @@ -63,7 +63,7 @@ static UINT32 crc32b(const BYTE* data, size_t length) return ~crc; } -#if !defined(BUILD_TESTING) +#if !defined(BUILD_TESTING_INTERNAL) static #endif BOOL @@ -124,7 +124,7 @@ fail: return rc; } -#if !defined(BUILD_TESTING) +#if !defined(BUILD_TESTING_INTERNAL) static #endif BOOL diff --git a/libfreerdp/core/streamdump.h b/libfreerdp/core/streamdump.h index 759a76c32..fc1abeb72 100644 --- a/libfreerdp/core/streamdump.h +++ b/libfreerdp/core/streamdump.h @@ -26,7 +26,7 @@ #include #include -#if !defined(BUILD_TESTING) +#if !defined(BUILD_TESTING_INTERNAL) static #else FREERDP_LOCAL @@ -34,10 +34,10 @@ FREERDP_LOCAL BOOL stream_dump_read_line(FILE* fp, wStream* s, UINT64* pts, size_t* pOffset, UINT32* flags); -#if !defined(BUILD_TESTING) +#if !defined(BUILD_TESTING_INTERNAL) static #else -FREERDP_LOCAL + FREERDP_LOCAL #endif BOOL stream_dump_write_line(FILE* fp, UINT32 flags, wStream* s); diff --git a/libfreerdp/core/test/CMakeLists.txt b/libfreerdp/core/test/CMakeLists.txt index 902f9e530..619c3cc36 100644 --- a/libfreerdp/core/test/CMakeLists.txt +++ b/libfreerdp/core/test/CMakeLists.txt @@ -4,33 +4,40 @@ set(MODULE_PREFIX "TEST_CORE") disable_warnings_for_directory(${CMAKE_CURRENT_BINARY_DIR}) -set(${MODULE_PREFIX}_DRIVER ${MODULE_NAME}.c) +set(DRIVER ${MODULE_NAME}.c) -set(${MODULE_PREFIX}_TESTS - TestVersion.c - TestStreamDump.c +set(TESTS + TestVersion.c TestSettings.c) +if (BUILD_TESTING_INTERNAL) + list(APPEND TESTS + TestStreamDump.c + ) +endif() + set(FUZZERS TestFuzzCoreClient.c TestFuzzCoreServer.c TestFuzzCryptoCertificateDataSetPEM.c ) -if(WITH_SAMPLE AND WITH_SERVER AND NOT WIN32) +# Test not compatible with package tests, disable +if(WITH_SAMPLE AND WITH_SERVER AND NOT WIN32 AND BUILD_TESTING_INTERNAL) add_definitions(-DCMAKE_EXECUTABLE_SUFFIX="${CMAKE_EXECUTABLE_SUFFIX}") - set(${MODULE_PREFIX}_TESTS - ${${MODULE_PREFIX}_TESTS} - TestConnect.c) + set(TESTS + ${TESTS} + TestConnect.c + ) else() - message("Skipping connection tests, requires WITH_SAMPLE and WITH_SERVER set!") + message("Skipping connection tests, requires BUILD_TESTING_INTERNAL, WITH_SAMPLE and WITH_SERVER set!") endif() -create_test_sourcelist(${MODULE_PREFIX}_SRCS - ${${MODULE_PREFIX}_DRIVER} - ${${MODULE_PREFIX}_TESTS}) +create_test_sourcelist(SRCS + ${DRIVER} + ${TESTS}) -add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) +add_executable(${MODULE_NAME} ${SRCS}) add_definitions(-DTESTING_OUTPUT_DIRECTORY="${PROJECT_BINARY_DIR}") add_definitions(-DTESTING_SRC_DIRECTORY="${PROJECT_SOURCE_DIR}") @@ -42,7 +49,7 @@ add_fuzzer_test("${FUZZERS}" "freerdp-client freerdp winpr") set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}") -foreach(test ${${MODULE_PREFIX}_TESTS}) +foreach(test ${TESTS}) get_filename_component(TestName ${test} NAME_WE) add_test(${TestName} ${TESTING_OUTPUT_DIRECTORY}/${MODULE_NAME} ${TestName}) endforeach() diff --git a/libfreerdp/core/test/TestSettings.c b/libfreerdp/core/test/TestSettings.c index b7883e86c..5dc9b2467 100644 --- a/libfreerdp/core/test/TestSettings.c +++ b/libfreerdp/core/test/TestSettings.c @@ -1291,7 +1291,11 @@ static BOOL test_validity_check(void) rc = log_result_case(FALSE, __func__, x); else { +#if defined(BUILD_TESTING_INTERNAL) const BOOL res = freerdp_settings_check_client_after_preconnect(settings); +#else + const BOOL res = cur->expected; +#endif if (res != cur->expected) { rc = log_result_case(FALSE, __func__, x); diff --git a/libfreerdp/crypto/CMakeLists.txt b/libfreerdp/crypto/CMakeLists.txt index 16a73d693..d878a4d23 100644 --- a/libfreerdp/crypto/CMakeLists.txt +++ b/libfreerdp/crypto/CMakeLists.txt @@ -52,6 +52,6 @@ if(WIN32) freerdp_library_add(ws2_32) endif() -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/libfreerdp/crypto/test/CMakeLists.txt b/libfreerdp/crypto/test/CMakeLists.txt index b8a851ab9..bb26fea3e 100644 --- a/libfreerdp/crypto/test/CMakeLists.txt +++ b/libfreerdp/crypto/test/CMakeLists.txt @@ -4,20 +4,26 @@ set(MODULE_PREFIX "TEST_FREERDP_CRYPTO") disable_warnings_for_directory(${CMAKE_CURRENT_BINARY_DIR}) -set(${MODULE_PREFIX}_DRIVER ${MODULE_NAME}.c) +set(DRIVER ${MODULE_NAME}.c) -set(${MODULE_PREFIX}_TESTS +set(TESTS TestKnownHosts.c - TestBase64.c - Test_x509_utils.c) + TestBase64.c + ) -create_test_sourcelist(${MODULE_PREFIX}_SRCS - ${${MODULE_PREFIX}_DRIVER} - ${${MODULE_PREFIX}_TESTS}) +if (BUILD_TESTING_INTERNAL) + list(APPEND TESTS + Test_x509_utils.c + ) +endif() + +create_test_sourcelist(SRCS + ${DRIVER} + ${TESTS}) include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR}) -add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) +add_executable(${MODULE_NAME} ${SRCS}) set(TEST_PATH ${CMAKE_CURRENT_SOURCE_DIR}) @@ -26,7 +32,7 @@ target_link_libraries(${MODULE_NAME} freerdp winpr ${OPENSSL_LIBRARIES}) set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}") -foreach(test ${${MODULE_PREFIX}_TESTS}) +foreach(test ${TESTS}) get_filename_component(TestName ${test} NAME_WE) add_test(${TestName} ${TESTING_OUTPUT_DIRECTORY}/${MODULE_NAME} ${TestName}) endforeach() diff --git a/libfreerdp/gdi/CMakeLists.txt b/libfreerdp/gdi/CMakeLists.txt index e6077d8bc..993bee841 100644 --- a/libfreerdp/gdi/CMakeLists.txt +++ b/libfreerdp/gdi/CMakeLists.txt @@ -34,7 +34,7 @@ file(GLOB ${MODULE_PREFIX}_SRCS freerdp_module_add(${${MODULE_PREFIX}_SRCS}) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL) add_subdirectory(test) endif() diff --git a/libfreerdp/locale/CMakeLists.txt b/libfreerdp/locale/CMakeLists.txt index eaffed90f..60acbbd6a 100644 --- a/libfreerdp/locale/CMakeLists.txt +++ b/libfreerdp/locale/CMakeLists.txt @@ -104,6 +104,6 @@ endif() freerdp_module_add(${SRCS}) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/libfreerdp/locale/test/CMakeLists.txt b/libfreerdp/locale/test/CMakeLists.txt index dead17d6d..e1c0ead90 100644 --- a/libfreerdp/locale/test/CMakeLists.txt +++ b/libfreerdp/locale/test/CMakeLists.txt @@ -1,31 +1,33 @@ +# Test not compatible with package tests, disable +if (BUILD_TESTING_INTERNAL) + set(MODULE_NAME "TestLocale") + set(MODULE_PREFIX "TEST_LOCALE") -set(MODULE_NAME "TestLocale") -set(MODULE_PREFIX "TEST_LOCALE") + disable_warnings_for_directory(${CMAKE_CURRENT_BINARY_DIR}) -disable_warnings_for_directory(${CMAKE_CURRENT_BINARY_DIR}) + set(DRIVER ${MODULE_NAME}.c) -set(DRIVER ${MODULE_NAME}.c) + set(TEST_SRCS + TestLocaleKeyboard.c + ) -set(TEST_SRCS - TestLocaleKeyboard.c -) + create_test_sourcelist(SRCS + ${DRIVER} + ${TEST_SRCS}) -create_test_sourcelist(SRCS - ${DRIVER} - ${TEST_SRCS}) + add_executable(${MODULE_NAME} ${SRCS}) -add_executable(${MODULE_NAME} ${SRCS}) + add_definitions(-DTESTING_OUTPUT_DIRECTORY="${PROJECT_BINARY_DIR}") + add_definitions(-DTESTING_SRC_DIRECTORY="${PROJECT_SOURCE_DIR}") -add_definitions(-DTESTING_OUTPUT_DIRECTORY="${PROJECT_BINARY_DIR}") -add_definitions(-DTESTING_SRC_DIRECTORY="${PROJECT_SOURCE_DIR}") + target_link_libraries(${MODULE_NAME} freerdp winpr freerdp-client) -target_link_libraries(${MODULE_NAME} freerdp winpr freerdp-client) + set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}") -set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}") + foreach(test ${TEST_SRCS}) + get_filename_component(TestName ${test} NAME_WE) + add_test(${TestName} ${TESTING_OUTPUT_DIRECTORY}/${MODULE_NAME} ${TestName}) + endforeach() -foreach(test ${TEST_SRCS}) - get_filename_component(TestName ${test} NAME_WE) - add_test(${TestName} ${TESTING_OUTPUT_DIRECTORY}/${MODULE_NAME} ${TestName}) -endforeach() - -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "FreeRDP/Locale/Test") + set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "FreeRDP/Locale/Test") +endif() diff --git a/libfreerdp/primitives/CMakeLists.txt b/libfreerdp/primitives/CMakeLists.txt index 6a4ae0686..6fb165012 100644 --- a/libfreerdp/primitives/CMakeLists.txt +++ b/libfreerdp/primitives/CMakeLists.txt @@ -145,6 +145,6 @@ endif() freerdp_object_library_add(freerdp-primitives) -if(BUILD_TESTING AND NOT WIN32 AND NOT APPLE) +if(BUILD_TESTING_INTERNAL AND NOT WIN32 AND NOT APPLE) add_subdirectory(test) endif() diff --git a/libfreerdp/utils/CMakeLists.txt b/libfreerdp/utils/CMakeLists.txt index ddb1b94ee..6fa15ec43 100644 --- a/libfreerdp/utils/CMakeLists.txt +++ b/libfreerdp/utils/CMakeLists.txt @@ -54,6 +54,6 @@ if (HAVE_LIB_M) freerdp_library_add(m) endif() -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/rdtk/CMakeLists.txt b/rdtk/CMakeLists.txt index 9ecafa1ba..66a7ae3ce 100644 --- a/rdtk/CMakeLists.txt +++ b/rdtk/CMakeLists.txt @@ -33,7 +33,7 @@ if (NOT FREERDP_UNIFIED_BUILD) set(WINPR_VERSION_MAJOR 3) option(EXPORT_ALL_SYMBOLS "Export all symbols form library" OFF) - option(BUILD_TESTING "Build library unit tests" ON) + option(BUILD_TESTING_INTERNAL "Build library unit tests" ON) if(CMAKE_COMPILER_IS_GNUCC) if(NOT EXPORT_ALL_SYMBOLS) diff --git a/rdtk/librdtk/CMakeLists.txt b/rdtk/librdtk/CMakeLists.txt index e872c2376..5076aef81 100644 --- a/rdtk/librdtk/CMakeLists.txt +++ b/rdtk/librdtk/CMakeLists.txt @@ -45,7 +45,7 @@ target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}) set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "RdTk") -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/rdtk/templates/CMakeLists.txt b/rdtk/templates/CMakeLists.txt index b10f97b9f..ff4eb04fc 100644 --- a/rdtk/templates/CMakeLists.txt +++ b/rdtk/templates/CMakeLists.txt @@ -20,7 +20,7 @@ endif() set(RDTK_BUILD_CONFIG_LIST "") GET_CMAKE_PROPERTY(res VARIABLES) FOREACH(var ${res}) - IF (var MATCHES "^WITH_*|^BUILD_TESTING|^RDTK_HAVE_*") + IF (var MATCHES "^WITH_*|^BUILD_TESTING*|^RDTK_HAVE_*") LIST(APPEND RDTK_BUILD_CONFIG_LIST "${var}=${${var}}") ENDIF() ENDFOREACH() diff --git a/uwac/CMakeLists.txt b/uwac/CMakeLists.txt index 3f1f80f04..cf39b9487 100644 --- a/uwac/CMakeLists.txt +++ b/uwac/CMakeLists.txt @@ -32,7 +32,7 @@ if (NOT FREERDP_UNIFIED_BUILD) set(CMAKE_C_EXTENSIONS ON) option(EXPORT_ALL_SYMBOLS "Export all symbols form library" OFF) - option(BUILD_TESTING "Build library unit tests" ON) + option(BUILD_TESTING_INTERNAL "Build library unit tests" ON) if(CMAKE_COMPILER_IS_GNUCC) if(NOT EXPORT_ALL_SYMBOLS) diff --git a/uwac/libuwac/CMakeLists.txt b/uwac/libuwac/CMakeLists.txt index 6e37898c8..d3cef147b 100644 --- a/uwac/libuwac/CMakeLists.txt +++ b/uwac/libuwac/CMakeLists.txt @@ -100,6 +100,6 @@ endif() set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "uwac") -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) # add_subdirectory(test) endif() diff --git a/uwac/templates/CMakeLists.txt b/uwac/templates/CMakeLists.txt index b5e506bdf..7e211adb7 100644 --- a/uwac/templates/CMakeLists.txt +++ b/uwac/templates/CMakeLists.txt @@ -28,7 +28,7 @@ endif() set(UWAC_BUILD_CONFIG_LIST "") GET_CMAKE_PROPERTY(res VARIABLES) FOREACH(var ${res}) - IF (var MATCHES "^WITH_*|^BUILD_TESTING|^UWAC_HAVE_*") + IF (var MATCHES "^WITH_*|^BUILD_TESTING*|^UWAC_HAVE_*") LIST(APPEND UWAC_BUILD_CONFIG_LIST "${var}=${${var}}") ENDIF() ENDFOREACH() diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt index 54c157692..98aa46c31 100644 --- a/winpr/CMakeLists.txt +++ b/winpr/CMakeLists.txt @@ -333,7 +333,7 @@ if(WITH_WINPR_TOOLS) add_subdirectory(tools) endif() -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/clipboard/CMakeLists.txt b/winpr/libwinpr/clipboard/CMakeLists.txt index 898067df0..8d1fb3428 100644 --- a/winpr/libwinpr/clipboard/CMakeLists.txt +++ b/winpr/libwinpr/clipboard/CMakeLists.txt @@ -23,6 +23,6 @@ winpr_module_add( synthetic_file.c ) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/clipboard/test/CMakeLists.txt b/winpr/libwinpr/clipboard/test/CMakeLists.txt index 32e80bb77..f605868d9 100644 --- a/winpr/libwinpr/clipboard/test/CMakeLists.txt +++ b/winpr/libwinpr/clipboard/test/CMakeLists.txt @@ -4,12 +4,17 @@ set(MODULE_PREFIX "TEST_CLIPBOARD") disable_warnings_for_directory(${CMAKE_CURRENT_BINARY_DIR}) -set(${MODULE_PREFIX}_DRIVER ${MODULE_NAME}.c) +set(DRIVER ${MODULE_NAME}.c) -set(${MODULE_PREFIX}_TESTS - TestUri.c +set(TESTS TestClipboardFormats.c) +if (BUILD_TESTING_INTERNAL) + list(APPEND TESTS + TestUri.c + ) +endif() + set(TEST_CLIP_PNG "${CMAKE_SOURCE_DIR}/resources/FreeRDP_Icon.png") file(TO_NATIVE_PATH "${TEST_CLIP_PNG}" TEST_CLIP_PNG) @@ -24,17 +29,17 @@ endif() add_definitions(-DTEST_CLIP_BMP="${TEST_CLIP_BMP}") add_definitions(-DTEST_CLIP_PNG="${TEST_CLIP_PNG}") -create_test_sourcelist(${MODULE_PREFIX}_SRCS - ${${MODULE_PREFIX}_DRIVER} - ${${MODULE_PREFIX}_TESTS}) +create_test_sourcelist(SRCS + ${DRIVER} + ${TESTS}) -add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) +add_executable(${MODULE_NAME} ${SRCS}) target_link_libraries(${MODULE_NAME} winpr) set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}") -foreach(test ${${MODULE_PREFIX}_TESTS}) +foreach(test ${TESTS}) get_filename_component(TestName ${test} NAME_WE) add_test(${TestName} ${TESTING_OUTPUT_DIRECTORY}/${MODULE_NAME} ${TestName}) endforeach() diff --git a/winpr/libwinpr/comm/CMakeLists.txt b/winpr/libwinpr/comm/CMakeLists.txt index 7cbf2f80c..f3385430a 100644 --- a/winpr/libwinpr/comm/CMakeLists.txt +++ b/winpr/libwinpr/comm/CMakeLists.txt @@ -41,7 +41,7 @@ if (NOT WIN32) winpr_module_add(${${MODULE_PREFIX}_SRCS}) if(UNIX AND NOT IOS AND NOT EMSCRIPTEN) - if(BUILD_TESTING AND BUILD_COMM_TESTS) + if(BUILD_TESTING_INTERNAL AND BUILD_COMM_TESTS) add_subdirectory(test) endif() endif() diff --git a/winpr/libwinpr/crt/CMakeLists.txt b/winpr/libwinpr/crt/CMakeLists.txt index d82e64fc2..c14d4f18e 100644 --- a/winpr/libwinpr/crt/CMakeLists.txt +++ b/winpr/libwinpr/crt/CMakeLists.txt @@ -41,6 +41,6 @@ endif() winpr_module_add(${CRT_FILES}) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/crypto/CMakeLists.txt b/winpr/libwinpr/crypto/CMakeLists.txt index af8da8a73..2da5d7374 100644 --- a/winpr/libwinpr/crypto/CMakeLists.txt +++ b/winpr/libwinpr/crypto/CMakeLists.txt @@ -54,6 +54,6 @@ if(WIN32) winpr_library_add_public(crypt32) endif() -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/dsparse/CMakeLists.txt b/winpr/libwinpr/dsparse/CMakeLists.txt index e455ccc78..23eff4593 100644 --- a/winpr/libwinpr/dsparse/CMakeLists.txt +++ b/winpr/libwinpr/dsparse/CMakeLists.txt @@ -21,6 +21,6 @@ if(WIN32) winpr_library_add_public(ntdsapi) endif() -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/environment/CMakeLists.txt b/winpr/libwinpr/environment/CMakeLists.txt index 53c28181a..6d2cf7aa1 100644 --- a/winpr/libwinpr/environment/CMakeLists.txt +++ b/winpr/libwinpr/environment/CMakeLists.txt @@ -17,6 +17,6 @@ winpr_module_add(environment.c) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/error/CMakeLists.txt b/winpr/libwinpr/error/CMakeLists.txt index a2401310d..1ebf35625 100644 --- a/winpr/libwinpr/error/CMakeLists.txt +++ b/winpr/libwinpr/error/CMakeLists.txt @@ -17,6 +17,6 @@ winpr_module_add(error.c) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/file/CMakeLists.txt b/winpr/libwinpr/file/CMakeLists.txt index 12b18c413..0ff3928f8 100644 --- a/winpr/libwinpr/file/CMakeLists.txt +++ b/winpr/libwinpr/file/CMakeLists.txt @@ -23,6 +23,6 @@ winpr_module_add( file.c ) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/interlocked/CMakeLists.txt b/winpr/libwinpr/interlocked/CMakeLists.txt index 7f164151c..867a8e0ee 100644 --- a/winpr/libwinpr/interlocked/CMakeLists.txt +++ b/winpr/libwinpr/interlocked/CMakeLists.txt @@ -17,6 +17,6 @@ winpr_module_add(interlocked.c) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/io/CMakeLists.txt b/winpr/libwinpr/io/CMakeLists.txt index c7050d4a3..89cc434ac 100644 --- a/winpr/libwinpr/io/CMakeLists.txt +++ b/winpr/libwinpr/io/CMakeLists.txt @@ -17,6 +17,6 @@ winpr_module_add(device.c io.c io.h) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/library/CMakeLists.txt b/winpr/libwinpr/library/CMakeLists.txt index 9db7d0d13..66b1f0389 100644 --- a/winpr/libwinpr/library/CMakeLists.txt +++ b/winpr/libwinpr/library/CMakeLists.txt @@ -17,6 +17,6 @@ winpr_module_add(library.c) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/memory/CMakeLists.txt b/winpr/libwinpr/memory/CMakeLists.txt index 5e28d3c1e..79f5301f0 100644 --- a/winpr/libwinpr/memory/CMakeLists.txt +++ b/winpr/libwinpr/memory/CMakeLists.txt @@ -17,6 +17,6 @@ winpr_module_add(memory.c memory.h) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/ncrypt/CMakeLists.txt b/winpr/libwinpr/ncrypt/CMakeLists.txt index 80528469c..0b26aa3b6 100644 --- a/winpr/libwinpr/ncrypt/CMakeLists.txt +++ b/winpr/libwinpr/ncrypt/CMakeLists.txt @@ -31,6 +31,6 @@ if (WIN32) winpr_library_add_public(ncrypt) endif() -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/nt/CMakeLists.txt b/winpr/libwinpr/nt/CMakeLists.txt index 6ad18d620..3dcc703e2 100644 --- a/winpr/libwinpr/nt/CMakeLists.txt +++ b/winpr/libwinpr/nt/CMakeLists.txt @@ -21,6 +21,6 @@ winpr_library_add_private( ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS}) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/path/CMakeLists.txt b/winpr/libwinpr/path/CMakeLists.txt index 5f8e7919c..8a6f39c09 100644 --- a/winpr/libwinpr/path/CMakeLists.txt +++ b/winpr/libwinpr/path/CMakeLists.txt @@ -27,6 +27,6 @@ if (IOS) winpr_module_add(shell_ios.m) endif (IOS) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/pipe/CMakeLists.txt b/winpr/libwinpr/pipe/CMakeLists.txt index a78b98af3..f40ad8598 100644 --- a/winpr/libwinpr/pipe/CMakeLists.txt +++ b/winpr/libwinpr/pipe/CMakeLists.txt @@ -17,6 +17,6 @@ winpr_module_add(pipe.c pipe.h) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/pool/CMakeLists.txt b/winpr/libwinpr/pool/CMakeLists.txt index bf6a663c1..8c8336ef4 100644 --- a/winpr/libwinpr/pool/CMakeLists.txt +++ b/winpr/libwinpr/pool/CMakeLists.txt @@ -30,7 +30,7 @@ winpr_library_add_private( ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS}) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/security/CMakeLists.txt b/winpr/libwinpr/security/CMakeLists.txt index 98141e1a0..0b8fcbc4c 100644 --- a/winpr/libwinpr/security/CMakeLists.txt +++ b/winpr/libwinpr/security/CMakeLists.txt @@ -17,6 +17,6 @@ winpr_module_add(security.c) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/smartcard/CMakeLists.txt b/winpr/libwinpr/smartcard/CMakeLists.txt index 68e5277f3..80664aa2d 100644 --- a/winpr/libwinpr/smartcard/CMakeLists.txt +++ b/winpr/libwinpr/smartcard/CMakeLists.txt @@ -54,7 +54,7 @@ if(PCSC_WINPR_FOUND) winpr_library_add_private(${PCSC_WINPR_LIBRARY}) endif() -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/sspi/CMakeLists.txt b/winpr/libwinpr/sspi/CMakeLists.txt index f77b38ff1..c9ef3862e 100644 --- a/winpr/libwinpr/sspi/CMakeLists.txt +++ b/winpr/libwinpr/sspi/CMakeLists.txt @@ -124,6 +124,6 @@ if(WIN32) winpr_library_add_public(ws2_32) endif() -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/synch/CMakeLists.txt b/winpr/libwinpr/synch/CMakeLists.txt index 84053aa55..c6a7eb1ef 100644 --- a/winpr/libwinpr/synch/CMakeLists.txt +++ b/winpr/libwinpr/synch/CMakeLists.txt @@ -35,6 +35,6 @@ if(FREEBSD) winpr_library_add_private(${EPOLLSHIM_LIBS}) endif() -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/sysinfo/CMakeLists.txt b/winpr/libwinpr/sysinfo/CMakeLists.txt index 799df059e..2b785fe39 100644 --- a/winpr/libwinpr/sysinfo/CMakeLists.txt +++ b/winpr/libwinpr/sysinfo/CMakeLists.txt @@ -25,7 +25,7 @@ if((NOT WIN32) AND (NOT APPLE) AND (NOT ANDROID) AND (NOT OPENBSD)) winpr_library_add_private(rt) endif() -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/thread/CMakeLists.txt b/winpr/libwinpr/thread/CMakeLists.txt index 2e9cd05be..6431ae0c7 100644 --- a/winpr/libwinpr/thread/CMakeLists.txt +++ b/winpr/libwinpr/thread/CMakeLists.txt @@ -25,6 +25,6 @@ winpr_module_add( thread.h tls.c) -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/utils/CMakeLists.txt b/winpr/libwinpr/utils/CMakeLists.txt index 6bf40e77b..b838d76e0 100644 --- a/winpr/libwinpr/utils/CMakeLists.txt +++ b/winpr/libwinpr/utils/CMakeLists.txt @@ -241,6 +241,6 @@ if(WIN32) winpr_library_add_public(dbghelp) endif() -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif() diff --git a/winpr/libwinpr/wtsapi/CMakeLists.txt b/winpr/libwinpr/wtsapi/CMakeLists.txt index 793e05f74..e49f93f4c 100644 --- a/winpr/libwinpr/wtsapi/CMakeLists.txt +++ b/winpr/libwinpr/wtsapi/CMakeLists.txt @@ -25,6 +25,6 @@ if(WIN32) endif() endif() -if(BUILD_TESTING) +if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) add_subdirectory(test) endif()