Skip to content

Commit 8725d9b

Browse files
committed
build: working around cmake 4.4 gtest JSON test parsing bug
1 parent 1abf05c commit 8725d9b

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -882,6 +882,7 @@ if(WITH_TESTS)
882882
883883
foreach(tgt ${TEST_TARGETS})
884884
gtest_discover_tests(${tgt}
885+
DISCOVERY_MODE PRE_TEST
885886
DISCOVERY_TIMEOUT 120
886887
PROPERTIES ${GTEST_COMMON_PROPERTIES}
887888
)
@@ -890,12 +891,14 @@ if(WITH_TESTS)
890891
foreach(tgt dwarfs_categorizer_tests tools_test)
891892
if(TARGET ${tgt})
892893
gtest_discover_tests(${tgt}
894+
DISCOVERY_MODE PRE_TEST
893895
DISCOVERY_TIMEOUT 120
894896
TEST_SUFFIX ".iolayer-read"
895897
PROPERTIES ${GTEST_COMMON_PROPERTIES}
896898
ENVIRONMENT "DWARFS_IOLAYER_OPTS=open_mode=read"
897899
)
898900
gtest_discover_tests(${tgt}
901+
DISCOVERY_MODE PRE_TEST
899902
DISCOVERY_TIMEOUT 120
900903
TEST_SUFFIX ".iolayer-map-size"
901904
PROPERTIES ${GTEST_COMMON_PROPERTIES}

ricepp/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ if(WITH_TESTS)
231231

232232
if(NOT CMAKE_CROSSCOMPILING)
233233
gtest_discover_tests(ricepp_test
234+
DISCOVERY_MODE PRE_TEST
234235
DISCOVERY_TIMEOUT 120
235236
PROPERTIES ENVIRONMENT "LLVM_PROFILE_FILE=${CMAKE_BINARY_DIR}/profile/%32m.profraw"
236237
)

0 commit comments

Comments
 (0)