Skip to content

Commit ec08124

Browse files
dschoGit for Windows Build Agent
authored andcommitted
cmake: stop looking for REFTABLE_TEST_OBJS in the Makefile
As of 15e29ea (t: move reftable/stack_test.c to the unit testing framework, 2024-09-08), the reftable tests are no longer part of `test-tool.exe`, so let's stop looking for those lines that are no longer in the `Makefile`. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]> (cherry picked from commit 75c4d8f)
1 parent 53486c9 commit ec08124

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

contrib/buildsystems/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -999,10 +999,6 @@ if(BUILD_TESTING)
999999
add_executable(test-fake-ssh ${CMAKE_SOURCE_DIR}/t/helper/test-fake-ssh.c)
10001000
target_link_libraries(test-fake-ssh common-main)
10011001

1002-
#reftable-tests
1003-
parse_makefile_for_sources(test-reftable_SOURCES "REFTABLE_TEST_OBJS")
1004-
list(TRANSFORM test-reftable_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
1005-
10061002
#unit-tests
10071003
add_library(unit-test-lib OBJECT ${CMAKE_SOURCE_DIR}/t/unit-tests/test-lib.c)
10081004
add_library(unit-test-lib-oid OBJECT ${CMAKE_SOURCE_DIR}/t/unit-tests/lib-oid.c)
@@ -1091,7 +1087,7 @@ parse_makefile_for_sources(test-tool_SOURCES "TEST_BUILTINS_OBJS")
10911087
add_library(test-lib OBJECT ${CMAKE_SOURCE_DIR}/t/unit-tests/test-lib.c)
10921088

10931089
list(TRANSFORM test-tool_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/t/helper/")
1094-
add_executable(test-tool ${CMAKE_SOURCE_DIR}/t/helper/test-tool.c ${test-tool_SOURCES} ${test-reftable_SOURCES})
1090+
add_executable(test-tool ${CMAKE_SOURCE_DIR}/t/helper/test-tool.c ${test-tool_SOURCES})
10951091
target_link_libraries(test-tool test-lib common-main)
10961092

10971093
set_target_properties(test-fake-ssh test-tool

0 commit comments

Comments
 (0)