From d9b03b45edbf3d37b109f3b78f256bbfb730ee02 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 4 Jul 2023 16:17:47 +0200 Subject: [PATCH] [test] add executable suffix for TestConnect --- libfreerdp/core/test/CMakeLists.txt | 1 + libfreerdp/core/test/TestConnect.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libfreerdp/core/test/CMakeLists.txt b/libfreerdp/core/test/CMakeLists.txt index 9664c459f..9ac9ac711 100644 --- a/libfreerdp/core/test/CMakeLists.txt +++ b/libfreerdp/core/test/CMakeLists.txt @@ -13,6 +13,7 @@ set(${MODULE_PREFIX}_FUZZERS TestFuzzCryptoCertificateDataSetPEM.c) if(WITH_SAMPLE AND WITH_SERVER) + add_definitions(-DCMAKE_EXECUTABLE_SUFFIX="${CMAKE_EXECUTABLE_SUFFIX}") set(${MODULE_PREFIX}_TESTS ${${MODULE_PREFIX}_TESTS} TestConnect.c) diff --git a/libfreerdp/core/test/TestConnect.c b/libfreerdp/core/test/TestConnect.c index 171066ec5..694d39628 100644 --- a/libfreerdp/core/test/TestConnect.c +++ b/libfreerdp/core/test/TestConnect.c @@ -211,7 +211,7 @@ static BOOL prepare_certificates(const char* path) return FALSE; exe = concatenate(5, TESTING_OUTPUT_DIRECTORY, "winpr", "tools", "makecert-cli", - "winpr-makecert"); + "winpr-makecert" CMAKE_EXECUTABLE_SUFFIX); if (!exe) return FALSE; _snprintf(commandLine, sizeof(commandLine), "%s -format crt -path . -n server", exe); @@ -261,7 +261,7 @@ static int testSuccess(int port) if (!path || !wpath) goto fail; - exe = GetCombinedPath(path, "sfreerdp-server"); + exe = GetCombinedPath(path, "sfreerdp-server" CMAKE_EXECUTABLE_SUFFIX); if (!exe) goto fail;