Skip to contentSkip to conversation

cmake: stop looking for `REFTABLE_TEST_OBJS` in the Makefile

PATCH New Johannes Schindelin via GitGitGadget 1 participant 1 message Sep 18, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cmake: stop looking for `REFTABLE_TEST_OBJS` in the Makefile

From: Johannes Schindelin <[email protected]>

As of 15e29ea1c648 (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.

---
cmake: stop looking for REFTABLE_TEST_OBJS in the Makefile

This is an add-on for cp/unit-test-reftable-stack to let it build with CMake and Visual C.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1796%2Fdscho%2Funit-test-reftable-stack%2Bcmake-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1796/dscho/unit-test-reftable-stack+cmake-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1796

 contrib/buildsystems/CMakeLists.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
contrib/buildsystems/CMakeLists.txt +1 -5
index 832f46b316b..af7447de6f1 100644
@@ -970,10 +970,6 @@ if(BUILD_TESTING)
 add_executable(test-fake-ssh ${CMAKE_SOURCE_DIR}/t/helper/test-fake-ssh.c)
 target_link_libraries(test-fake-ssh common-main)
 
-#reftable-tests
-parse_makefile_for_sources(test-reftable_SOURCES "REFTABLE_TEST_OBJS")
-list(TRANSFORM test-reftable_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
-
 #unit-tests
 add_library(unit-test-lib OBJECT ${CMAKE_SOURCE_DIR}/t/unit-tests/test-lib.c)
 add_library(unit-test-lib-oid OBJECT ${CMAKE_SOURCE_DIR}/t/unit-tests/lib-oid.c)
@@ -1009,7 +1005,7 @@ parse_makefile_for_sources(test-tool_SOURCES "TEST_BUILTINS_OBJS")
 add_library(test-lib OBJECT ${CMAKE_SOURCE_DIR}/t/unit-tests/test-lib.c)
 
 list(TRANSFORM test-tool_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/t/helper/")
-add_executable(test-tool ${CMAKE_SOURCE_DIR}/t/helper/test-tool.c ${test-tool_SOURCES} ${test-reftable_SOURCES})
+add_executable(test-tool ${CMAKE_SOURCE_DIR}/t/helper/test-tool.c ${test-tool_SOURCES})
 target_link_libraries(test-tool test-lib common-main)
 
 set_target_properties(test-fake-ssh test-tool

base-commit: 2b14ced370aea017efc32b525fd72a6dd2cc60c5

Signature · 1 line
gitgitgadget