From e66530d200334647724d49bdde7e3ca45373141e Mon Sep 17 00:00:00 2001 From: anporumb Date: Thu, 17 Oct 2024 21:51:45 -0700 Subject: [PATCH] use latest master AND modifications for latest ctestrunnerswitcher (#390) * pal_interfaces now appears in Visual Studio and has mocks * now it compiles on Linux too * propagate_all_repos anporumb/pchmock4 * propagate_all_repos anporumb/pchmock4 * spaces removed apparently * propagate_all_repos anporumb/pchmock4 * propagate_all_repos anporumb/pchmock4 * use the variable set in c-testrunnerswitcher * propagate_all_repos anporumb/pchmock4 * propagate_all_repos anporumb/pchmock4 * propagate_all_repos anporumb/pchmock4 * propagate_all_repos anporumb/pchmock4 * propagate_all_repos anporumb/pchmock4 * propagate_all_repos anporumb/pchmock4 * propagate_all_repos anporumb/pchmock4 * propagate_all_repos anporumb/pchmock4 * revert interfaces/CMakeLists.txt to master * use latest dependencies 17 Oct 2024 * use vcpkg from master --- deps/c-testrunnerswitcher | 2 +- deps/umock-c | 2 +- win32/tests/gballoc_hl_int/CMakeLists.txt | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/deps/c-testrunnerswitcher b/deps/c-testrunnerswitcher index 42d98eb..f794d09 160000 --- a/deps/c-testrunnerswitcher +++ b/deps/c-testrunnerswitcher @@ -1 +1 @@ -Subproject commit 42d98eb853e0752799f0aa82dbf3fe1ab5d54ba9 +Subproject commit f794d0905a9fd31c4f1e59e47cf1932300b71485 diff --git a/deps/umock-c b/deps/umock-c index 40f5bd2..2db7256 160000 --- a/deps/umock-c +++ b/deps/umock-c @@ -1 +1 @@ -Subproject commit 40f5bd2abc3859484565b57f96fd14d80059d75f +Subproject commit 2db725673f96ac5d5c9a5e8d1d93854eac8632af diff --git a/win32/tests/gballoc_hl_int/CMakeLists.txt b/win32/tests/gballoc_hl_int/CMakeLists.txt index 1235351..0c687a2 100644 --- a/win32/tests/gballoc_hl_int/CMakeLists.txt +++ b/win32/tests/gballoc_hl_int/CMakeLists.txt @@ -2,13 +2,14 @@ #Licensed under the MIT license. See LICENSE file in the project root for full license information. #this cmakelists.txt in intended to build test for every combination of gballoc_hl and gballoc_ll -#to do that, it uses GBALOC_LL_IMPL and GBALLOC_HL_IMPL (which are set in a foreach() loop in the folder above). -#since it would result in multiple of the same target, it uses ${BINARY_DIR} suffix on the CMake binary build folder AND on the targets that it builds (they all need to be unique) +#to do that, it uses GBALOC_LL_IMPL and GBALLOC_HL_IMPL (which are set in a foreach() loop in the folder above). +#since it would result in multiple of the same target, it uses ${arg_BINARY_DIR} suffix on the CMake binary build folder AND on the targets that it builds (they all need to be unique) +#arg_BINARY_DIR is set in function(build_test_folder...) in c-testrunnerswitcher -set(theseTestsNameBase gballoc_hl_int) +set(theseTestsNameBase gballoc_hl_int) -set(theseTestsName ${theseTestsNameBase}_${BINARY_DIR}_int) +set(theseTestsName ${theseTestsNameBase}_${arg_BINARY_DIR}_int) set(${theseTestsName}_test_files ${theseTestsNameBase}.c