Skip to content

Commit

Permalink
Simplify mem_helpers usage in unit tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
davisp authored and abigalekim committed Feb 7, 2024
1 parent fdcf73b commit 084b2a3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
1 change: 1 addition & 0 deletions test/support/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ if (NOT MSVC)
endif()

target_link_libraries(tiledb_test_support_lib PRIVATE $<BUILD_INTERFACE:common>)
target_link_libraries(tiledb_test_support_lib PRIVATE baseline)

target_include_directories(
tiledb_test_support_lib BEFORE PRIVATE
Expand Down
15 changes: 1 addition & 14 deletions tiledb/sm/query/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,11 @@

include(unit_test)

set(MEM_TEST_SUPPORT_SOURCES
${CMAKE_SOURCE_DIR}/test/support/src/mem_helpers.h
${CMAKE_SOURCE_DIR}/test/support/src/mem_helpers.cc
)

add_library(mem_test_support_lib STATIC EXCLUDE_FROM_ALL ${MEM_TEST_SUPPORT_SOURCES})

find_package(Boost REQUIRED COMPONENTS container)
target_include_directories(mem_test_support_lib PRIVATE Boost_INCLUDE_DIRS)
target_link_libraries(mem_test_support_lib Boost::container)

commence(unit_test query)
this_target_sources(main.cc unit_validity_vector.cc unit_query_condition.cc)
# Not actually testing a unit yet, but some things that ought to be units
this_target_link_libraries(TILEDB_CORE_OBJECTS TILEDB_CORE_OBJECTS_ILIB)
this_target_link_libraries(tiledb_test_support_lib)
this_target_link_libraries(ast_test_support_lib)
this_target_link_libraries(mem_test_support_lib)


# We want tests to continue as normal even as the API is changing,
# so don't warn for deprecations, since they'll be escalated to errors.
Expand Down

0 comments on commit 084b2a3

Please sign in to comment.