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:31:06 +01:00
parent db66ada0b2 a61653b2d8
commit b9e60e2fa0
3 changed files with 34 additions and 2 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

@ -119,6 +119,23 @@ if ( CGAL_FOUND )
target_link_libraries(${target} PUBLIC CGAL::TBB_support)
endif()
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()
else()

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

@ -47,11 +47,18 @@ if ( CGAL_FOUND )
create_single_source_cgal_program( "sequential_parallel.cpp" )
target_link_libraries( parallel_insertion_and_removal_in_regular_3 PUBLIC CGAL::TBB_support)
target_link_libraries( parallel_insertion_in_delaunay_3 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()
message(STATUS "NOTICE: a few examples require TBB and will not be compiled.")
endif()
else()
message(STATUS "This program requires the CGAL library, and will not be compiled.")

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

@ -38,6 +38,14 @@ if ( CGAL_FOUND )
test_regular_insert_range_with_info)
target_link_libraries(${target} PUBLIC CGAL::TBB_support)
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()
if(BUILD_TESTING)