Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

Introduce options to enable array/vector/string #270

Merged
szyrom merged 1 commit into from
Mar 14, 2019
Merged

Introduce options to enable array/vector/string #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ option(USE_ASAN "enable AddressSanitizer (debugging)" OFF)
option(USE_UBSAN "enable UndefinedBehaviorSanitizer (debugging)" OFF)
option(TESTS_USE_FORCED_PMEM "run tests with PMEM_IS_PMEM_FORCE=1" OFF)
option(TESTS_USE_VALGRIND "enable tests with valgrind (if found)" ON)
option(ENABLE_ARRAY "enable installation and testing of pmem::obj::experimental::array" ON)
option(ENABLE_VECTOR "enable installation and testing of pmem::obj::experimental::vector" ON)
option(ENABLE_STRING "enable installation and testing of pmem::obj::experimental::string (depends on ENABLE_VECTOR)" ON)

# Required for MSVC to correctly define __cplusplus
add_flag("/Zc:__cplusplus")
Expand Down Expand Up @@ -223,7 +226,31 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake/version.hpp.in
${CMAKE_SOURCE_DIR}/include/libpmemobj++/version.hpp @ONLY)

install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
FILES_MATCHING PATTERN "*.hpp")
FILES_MATCHING PATTERN "*.hpp"
PATTERN "array.hpp" EXCLUDE
PATTERN "vector.hpp" EXCLUDE
PATTERN "string.hpp" EXCLUDE
PATTERN "basic_string.hpp" EXCLUDE
PATTERN "contiguous_iterator.hpp" EXCLUDE
PATTERN "slice.hpp" EXCLUDE)

if (ENABLE_ARRAY)
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "array.hpp")
endif()

if (ENABLE_VECTOR)
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "vector.hpp")
endif()

if (ENABLE_STRING)
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "basic_string.hpp")
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "string.hpp")
endif()

if (ENABLE_ARRAY OR ENABLE_VECTOR OR ENABLE_STRING)
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "contiguous_iterator.hpp")
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "slice.hpp")
endif()

install(DIRECTORY examples/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples
FILES_MATCHING PATTERN "*.*pp")
Expand Down
144 changes: 75 additions & 69 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,24 +212,9 @@ else()
skip_test("make_persistent_array" "SKIPPED_BECAUSE_OF_CLANG_TEMPLATE_BUG")
endif()

build_test(array_algorithms array_algorithms/array_algorithms.cpp)
add_test_generic(NAME array_algorithms TRACERS none pmemcheck)

build_test(array_slice array_slice/array_slice.cpp)
add_test_generic(NAME array_slice CASE 0 TRACERS none pmemcheck memcheck)

build_test(array_iterator array_iterator/array_iterator.cpp)
add_test_generic(NAME array_iterator TRACERS none pmemcheck)

build_test(array_modifiers array_modifiers/array_modifiers.cpp)
add_test_generic(NAME array_modifiers TRACERS none pmemcheck memcheck)

build_test(iterator_traits iterator_traits/iterator_traits.cpp)
add_test_generic(NAME iterator_traits TRACERS none)

build_test(temp_value temp_value/temp_value.cpp)
add_test_generic(NAME temp_value TRACERS none pmemcheck memcheck)

build_test(ctl ctl/ctl.cpp)
add_test_generic(NAME ctl CASE 0 TRACERS none)

Expand All @@ -238,84 +223,105 @@ if(WIN32)
add_test_generic(NAME ctl_win CASE 0 TRACERS none)
endif()

if(PMREORDER_SUPPORTED)
build_test(array_slice_pmreorder array_slice_pmreorder/array_slice_pmreorder.cpp)
add_test_generic(NAME array_slice_pmreorder CASE 0 TRACERS none)
add_test_generic(NAME array_slice_pmreorder CASE 1 TRACERS none)
else()
message(WARNING "Skipping pmreorder tests because of no pmreorder support")
if (ENABLE_ARRAY)
build_test(array_algorithms array_algorithms/array_algorithms.cpp)
add_test_generic(NAME array_algorithms TRACERS none pmemcheck)

build_test(array_slice array_slice/array_slice.cpp)
add_test_generic(NAME array_slice CASE 0 TRACERS none pmemcheck memcheck)

build_test(array_iterator array_iterator/array_iterator.cpp)
add_test_generic(NAME array_iterator TRACERS none pmemcheck)

build_test(array_modifiers array_modifiers/array_modifiers.cpp)
add_test_generic(NAME array_modifiers TRACERS none pmemcheck memcheck)

if(PMREORDER_SUPPORTED)
build_test(array_slice_pmreorder array_slice_pmreorder/array_slice_pmreorder.cpp)
add_test_generic(NAME array_slice_pmreorder CASE 0 TRACERS none)
add_test_generic(NAME array_slice_pmreorder CASE 1 TRACERS none)
else()
message(WARNING "Skipping pmreorder tests because of no pmreorder support")
endif()
endif()

build_test(vector_assign_exceptions_length vector_assign_exceptions_length/vector_assign_exceptions_length.cpp)
add_test_generic(NAME vector_assign_exceptions_length TRACERS none memcheck pmemcheck)
if (ENABLE_VECTOR)
build_test(temp_value temp_value/temp_value.cpp)
add_test_generic(NAME temp_value TRACERS none pmemcheck memcheck)

build_test(vector_assign_exceptions_oom vector_assign_exceptions_oom/vector_assign_exceptions_oom.cpp)
add_test_generic(NAME vector_assign_exceptions_oom TRACERS none memcheck pmemcheck)
build_test(vector_assign_exceptions_length vector_assign_exceptions_length/vector_assign_exceptions_length.cpp)
add_test_generic(NAME vector_assign_exceptions_length TRACERS none memcheck pmemcheck)

build_test(vector_assign_txabort vector_assign_txabort/vector_assign_txabort.cpp)
add_test_generic(NAME vector_assign_txabort TRACERS none memcheck pmemcheck)
build_test(vector_assign_exceptions_oom vector_assign_exceptions_oom/vector_assign_exceptions_oom.cpp)
add_test_generic(NAME vector_assign_exceptions_oom TRACERS none memcheck pmemcheck)

build_test(vector_comp_operators vector_comp_operators/vector_comp_operators.cpp)
add_test_generic(NAME vector_comp_operators TRACERS none memcheck pmemcheck)
build_test(vector_assign_txabort vector_assign_txabort/vector_assign_txabort.cpp)
add_test_generic(NAME vector_assign_txabort TRACERS none memcheck pmemcheck)

build_test(vector_capacity_exceptions_length vector_capacity_exceptions_length/vector_capacity_exceptions_length.cpp)
add_test_generic(NAME vector_capacity_exceptions_length TRACERS none memcheck pmemcheck)
build_test(vector_comp_operators vector_comp_operators/vector_comp_operators.cpp)
add_test_generic(NAME vector_comp_operators TRACERS none memcheck pmemcheck)

build_test(vector_capacity_exceptions_oom vector_capacity_exceptions_oom/vector_capacity_exceptions_oom.cpp)
add_test_generic(NAME vector_capacity_exceptions_oom TRACERS none memcheck pmemcheck)
build_test(vector_capacity_exceptions_length vector_capacity_exceptions_length/vector_capacity_exceptions_length.cpp)
add_test_generic(NAME vector_capacity_exceptions_length TRACERS none memcheck pmemcheck)

build_test(vector_capacity_txabort vector_capacity_txabort/vector_capacity_txabort.cpp)
add_test_generic(NAME vector_capacity_txabort TRACERS none memcheck pmemcheck)
build_test(vector_capacity_exceptions_oom vector_capacity_exceptions_oom/vector_capacity_exceptions_oom.cpp)
add_test_generic(NAME vector_capacity_exceptions_oom TRACERS none memcheck pmemcheck)

build_test(vector_ctor_exceptions_nopmem vector_ctor_exceptions_nopmem/vector_ctor_exceptions_nopmem.cpp)
add_test_generic(NAME vector_ctor_exceptions_nopmem TRACERS none memcheck )
build_test(vector_capacity_txabort vector_capacity_txabort/vector_capacity_txabort.cpp)
add_test_generic(NAME vector_capacity_txabort TRACERS none memcheck pmemcheck)

build_test(vector_ctor_exceptions_notx vector_ctor_exceptions_notx/vector_ctor_exceptions_notx.cpp)
add_test_generic(NAME vector_ctor_exceptions_notx TRACERS none memcheck)
build_test(vector_ctor_exceptions_nopmem vector_ctor_exceptions_nopmem/vector_ctor_exceptions_nopmem.cpp)
add_test_generic(NAME vector_ctor_exceptions_nopmem TRACERS none memcheck )

build_test(vector_ctor_exceptions_oom vector_ctor_exceptions_oom/vector_ctor_exceptions_oom.cpp)
add_test_generic(NAME vector_ctor_exceptions_oom TRACERS none memcheck pmemcheck)
build_test(vector_ctor_exceptions_notx vector_ctor_exceptions_notx/vector_ctor_exceptions_notx.cpp)
add_test_generic(NAME vector_ctor_exceptions_notx TRACERS none memcheck)

build_test(vector_ctor_move vector_ctor_move/vector_ctor_move.cpp)
add_test_generic(NAME vector_ctor_move TRACERS none memcheck pmemcheck)
build_test(vector_ctor_exceptions_oom vector_ctor_exceptions_oom/vector_ctor_exceptions_oom.cpp)
add_test_generic(NAME vector_ctor_exceptions_oom TRACERS none memcheck pmemcheck)

build_test(vector_ctor_capacity vector_ctor_capacity/vector_ctor_capacity.cpp)
add_test_generic(NAME vector_ctor_capacity TRACERS none memcheck pmemcheck)
build_test(vector_ctor_move vector_ctor_move/vector_ctor_move.cpp)
add_test_generic(NAME vector_ctor_move TRACERS none memcheck pmemcheck)

build_test(vector_dtor vector_dtor/vector_dtor.cpp)
add_test_generic(NAME vector_dtor TRACERS none memcheck pmemcheck)
build_test(vector_ctor_capacity vector_ctor_capacity/vector_ctor_capacity.cpp)
add_test_generic(NAME vector_ctor_capacity TRACERS none memcheck pmemcheck)

build_test(vector_iterators_access vector_iterators_access/vector_iterators_access.cpp)
add_test_generic(NAME vector_iterators_access TRACERS none memcheck pmemcheck)
build_test(vector_dtor vector_dtor/vector_dtor.cpp)
add_test_generic(NAME vector_dtor TRACERS none memcheck pmemcheck)

build_test(vector_ctor_check_copy vector_ctor_check_copy/vector_ctor_check_copy.cpp)
add_test_generic(NAME vector_ctor_check_copy TRACERS none memcheck pmemcheck)
build_test(vector_iterators_access vector_iterators_access/vector_iterators_access.cpp)
add_test_generic(NAME vector_iterators_access TRACERS none memcheck pmemcheck)

build_test(vector_modifiers_exceptions_oom vector_modifiers_exceptions_oom/vector_modifiers_exceptions_oom.cpp)
add_test_generic(NAME vector_modifiers_exceptions_oom TRACERS none memcheck pmemcheck)
build_test(vector_ctor_check_copy vector_ctor_check_copy/vector_ctor_check_copy.cpp)
add_test_generic(NAME vector_ctor_check_copy TRACERS none memcheck pmemcheck)

build_test(vector_modifiers_txabort vector_modifiers_txabort/vector_modifiers_txabort.cpp)
add_test_generic(NAME vector_modifiers_txabort TRACERS none memcheck pmemcheck)
build_test(vector_modifiers_exceptions_oom vector_modifiers_exceptions_oom/vector_modifiers_exceptions_oom.cpp)
add_test_generic(NAME vector_modifiers_exceptions_oom TRACERS none memcheck pmemcheck)

build_test(string_access string_access/string_access.cpp)
add_test_generic(NAME string_access TRACERS none memcheck pmemcheck)
build_test(vector_modifiers_txabort vector_modifiers_txabort/vector_modifiers_txabort.cpp)
add_test_generic(NAME vector_modifiers_txabort TRACERS none memcheck pmemcheck)

build_test(string_exceptions string_exceptions/string_exceptions.cpp)
add_test_generic(NAME string_exceptions TRACERS none memcheck pmemcheck)
build_test(vector_modifiers_type_requirements vector_modifiers_type_requirements/vector_modifiers_type_requirements.cpp)
add_test_generic(NAME vector_modifiers_type_requirements TRACERS none memcheck pmemcheck)

build_test(string_snapshot string_snapshot/string_snapshot.cpp)
add_test_generic(NAME string_snapshot TRACERS none memcheck pmemcheck)
build_test(vector_std_arg vector_std_arg/vector_std_arg.cpp)
add_test_generic(NAME vector_std_arg TRACERS none memcheck pmemcheck)

build_test(string_assign_tx_abort string_assign_tx_abort/string_assign_tx_abort.cpp)
add_test_generic(NAME string_assign_tx_abort TRACERS none memcheck pmemcheck)
build_test(vector_range vector_range/vector_range.cpp)
add_test_generic(NAME vector_range TRACERS none memcheck pmemcheck)
endif()

if (ENABLE_STRING)
build_test(string_access string_access/string_access.cpp)
add_test_generic(NAME string_access TRACERS none memcheck pmemcheck)

build_test(vector_modifiers_type_requirements vector_modifiers_type_requirements/vector_modifiers_type_requirements.cpp)
add_test_generic(NAME vector_modifiers_type_requirements TRACERS none memcheck pmemcheck)
build_test(string_exceptions string_exceptions/string_exceptions.cpp)
add_test_generic(NAME string_exceptions TRACERS none memcheck pmemcheck)

build_test(vector_std_arg vector_std_arg/vector_std_arg.cpp)
add_test_generic(NAME vector_std_arg TRACERS none memcheck pmemcheck)
build_test(string_snapshot string_snapshot/string_snapshot.cpp)
add_test_generic(NAME string_snapshot TRACERS none memcheck pmemcheck)

build_test(vector_range vector_range/vector_range.cpp)
add_test_generic(NAME vector_range TRACERS none memcheck pmemcheck)
build_test(string_assign_tx_abort string_assign_tx_abort/string_assign_tx_abort.cpp)
add_test_generic(NAME string_assign_tx_abort TRACERS none memcheck pmemcheck)
endif()

add_subdirectory(external)
Loading