songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5474 from danston/TBB-execution_failures-danston 

Triangulation_3 and Mesh_3 Timeouts for parallel tests fix
This commit is contained in:
Laurent Rineau 2021-03-03 16:39:31 +01:00
parent e522630610 a61653b2d8
commit e8a1e05202
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Mesh_3/test/Mesh_3/CMakeLists.txt
View File

@ -121,6 +121,23 @@ if ( CGAL_FOUND )
target_link_libraries(${target} PUBLIC CGAL::TBB_support) target_link_libraries(${target} PUBLIC CGAL::TBB_support)
endif() endif()
endforeach() endforeach()
if(BUILD_TESTING)
set_property(TEST
execution___of__test_meshing_verbose
execution___of__test_meshing_polyhedron_with_features
execution___of__test_meshing_implicit_function
execution___of__test_meshing_3D_image
execution___of__test_meshing_3D_gray_image
execution___of__test_meshing_unit_tetrahedron
execution___of__test_meshing_polyhedron
execution___of__test_meshing_polyhedral_complex
execution___of__test_mesh_capsule_var_distance_bound
execution___of__test_mesh_3_issue_1554
execution___of__test_mesh_polyhedral_domain_with_features_deprecated
execution___of__test_mesh_cell_base_3
PROPERTY RUN_SERIAL 1)
endif()
endif() endif()
if(TARGET ITT::ITT) if(TARGET ITT::ITT)
target_link_libraries(test_meshing_polyhedron_with_features PRIVATE ITT::ITT) target_link_libraries(test_meshing_polyhedron_with_features PRIVATE ITT::ITT)

8
Triangulation_3/examples/Triangulation_3/CMakeLists.txt
View File

@ -53,6 +53,14 @@ if(TARGET CGAL::TBB_support)
target_link_libraries(parallel_insertion_in_delaunay_3 target_link_libraries(parallel_insertion_in_delaunay_3
PUBLIC CGAL::TBB_support) PUBLIC CGAL::TBB_support)
target_link_libraries(sequential_parallel PUBLIC CGAL::TBB_support) target_link_libraries(sequential_parallel PUBLIC CGAL::TBB_support)
if(BUILD_TESTING)
set_property(TEST
execution___of__parallel_insertion_and_removal_in_regular_3
execution___of__parallel_insertion_in_delaunay_3
execution___of__sequential_parallel
PROPERTY RUN_SERIAL 1)
endif()
else() else()
message(STATUS "NOTICE: a few examples require TBB and will not be compiled.") message(STATUS "NOTICE: a few examples require TBB and will not be compiled.")
endif() endif()

7
Triangulation_3/test/Triangulation_3/CMakeLists.txt
View File

@ -35,6 +35,13 @@ if(TARGET CGAL::TBB_support)
test_regular_insert_range_with_info) test_regular_insert_range_with_info)
target_link_libraries(${target} PUBLIC CGAL::TBB_support) target_link_libraries(${target} PUBLIC CGAL::TBB_support)
endforeach() endforeach()
if(BUILD_TESTING)
set_property(TEST
execution___of__test_delaunay_3
execution___of__test_regular_3
execution___of__test_regular_insert_range_with_info
PROPERTY RUN_SERIAL 1)
endif()
endif() endif()
if(BUILD_TESTING) if(BUILD_TESTING)