Skip to content

Commit

Permalink
cmake: Add algorithms/ and graph/ C++ tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Mizux committed Oct 7, 2024
1 parent a02548f commit ae517c0
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 618 deletions.
10 changes: 5 additions & 5 deletions cmake/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ TOOLCHAIN_STAGES := env devel toolchain build test
define toolchain-stage-target =
#$$(info STAGE: $1)
#$$(info Create targets: toolchain_$1 $(addprefix toolchain_, $(addsuffix _$1, $(TOOLCHAIN_TARGETS))).)
targets_toolchain_$1 = $(addprefix toolchain_, $(addsuffix _$1, $(TOOLCHAIN_TARGETS)))
targets_toolchain_$1 := $(addprefix toolchain_, $(addsuffix _$1, $(TOOLCHAIN_TARGETS)))
.PHONY: toolchain_$1 $$(targets_toolchain_$1)
toolchain_$1: $$(targets_toolchain_$1)
$$(targets_toolchain_$1): toolchain_%_$1: docker/toolchain/Dockerfile
Expand All @@ -645,7 +645,7 @@ $$(targets_toolchain_$1): toolchain_%_$1: docker/toolchain/Dockerfile
..

#$$(info Create targets: save_toolchain_$1 $(addprefix save_toolchain_, $(addsuffix _$1, $(TOOLCHAIN_TARGETS))) (debug).)
save_targets_toolchain_$1 = $(addprefix save_toolchain_, $(addsuffix _$1, $(TOOLCHAIN_TARGETS)))
save_targets_toolchain_$1 := $(addprefix save_toolchain_, $(addsuffix _$1, $(TOOLCHAIN_TARGETS)))
.PHONY: save_toolchain_$1 $$(save_targets_toolchain_$1)
save_toolchain_$1: $$(save_targets_toolchain_$1)
$$(save_targets_toolchain_$1): save_toolchain_%_$1: cache/%/docker_$1.tar
Expand Down Expand Up @@ -727,7 +727,7 @@ VAGRANT_VMS := \
define make-vagrant-target =
#$$(info VMS: $1)
#$$(info Create target: $1_<LANG>.)
$1_targets = $(addprefix $1_, $(LANGUAGES))
$1_targets := $(addprefix $1_, $(LANGUAGES))
.PHONY: $1 $$($1_targets)
$1: $$($1_targets)
$$($1_targets): $1_%: vagrant/$1/%/Vagrantfile
Expand All @@ -736,14 +736,14 @@ $$($1_targets): $1_%: vagrant/$1/%/Vagrantfile
cd vagrant/$1/$$* && vagrant up

#$$(info Create targets: sh_$1_<lang> vagrant machine (debug).)
sh_$1_targets = $(addprefix sh_$1_, $(LANGUAGES))
sh_$1_targets := $(addprefix sh_$1_, $(LANGUAGES))
.PHONY: $$(sh_$1_targets)
$$(sh_$1_targets): sh_$1_%:
cd vagrant/$1/$$* && vagrant up
cd vagrant/$1/$$* && vagrant ssh

#$$(info Create targets: clean_$1)
clean_$1_targets = $(addprefix clean_$1_, $(LANGUAGES))
clean_$1_targets := $(addprefix clean_$1_, $(LANGUAGES))
.PHONY: clean_$1 $(clean_$1_targets)
clean_$1: $$(clean_$1_targets)
$$(clean_$1_targets): clean_$1_%:
Expand Down
9 changes: 9 additions & 0 deletions ortools/algorithms/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,15 @@ cc_library(
],
)

cc_test(
name = "dense_doubly_linked_list_test",
srcs = ["dense_doubly_linked_list_test.cc"],
deps = [
":dense_doubly_linked_list",
"//ortools/base:gmock_main",
],
)

cc_library(
name = "dynamic_partition",
srcs = ["dynamic_partition.cc"],
Expand Down
22 changes: 21 additions & 1 deletion ortools/algorithms/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# limitations under the License.

file(GLOB _SRCS "*.h" "*.cc")
list(FILTER _SRCS EXCLUDE REGEX "/[^/]*_test\\.cc$")
list(FILTER _SRCS EXCLUDE REGEX ".*/.*_test.cc")

set(NAME ${PROJECT_NAME}_algorithms)

Expand All @@ -31,3 +31,23 @@ target_link_libraries(${NAME} PRIVATE
protobuf::libprotobuf
${PROJECT_NAMESPACE}::ortools_proto)
#add_library(${PROJECT_NAMESPACE}::algorithms ALIAS ${NAME})

if(BUILD_TESTING)
file(GLOB _TEST_SRCS "*_test.cc")
list(FILTER _TEST_SRCS EXCLUDE REGEX ".*_stress_test.cc")
list(FILTER _TEST_SRCS EXCLUDE REGEX "set_cover_test.cc")
foreach(_FULL_FILE_NAME IN LISTS _TEST_SRCS)
get_filename_component(_NAME ${_FULL_FILE_NAME} NAME_WE)
get_filename_component(_FILE_NAME ${_FULL_FILE_NAME} NAME)
ortools_cxx_test(
NAME
algorithms_${_NAME}
SOURCES
${_FILE_NAME}
LINK_LIBRARIES
benchmark::benchmark
GTest::gmock
GTest::gtest_main
)
endforeach()
endif()
184 changes: 0 additions & 184 deletions ortools/algorithms/duplicate_remover_test.cc

This file was deleted.

Loading

0 comments on commit ae517c0

Please sign in to comment.