Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'worklet_testing_proper_device_adapter'

Browse Source 
d77ac2c8 Don't explicitly set backend on tests that use error backend.
4a750231 UnitTests with an explicitly backend pass it as a compile def

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1201
This commit is contained in:
Robert Maynard 2018-05-11 19:28:54 +00:00 committed by Kitware Robot
commit ea721a2420
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMake/VTKmWrappers.cmake
View File

@ -414,9 +414,8 @@ function(vtkm_unit_tests)
set_property(TARGET ${test_prog} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${VTKm_EXECUTABLE_OUTPUT_PATH})
target_link_libraries(${test_prog} PRIVATE vtkm_cont ${VTKm_UT_LIBRARIES})
if(VTKm_UT_NO_TESTS)
return()
if(backend)
target_compile_definitions(${test_prog} PRIVATE "VTKM_DEVICE_ADAPTER=VTKM_DEVICE_ADAPTER_${backend}")
endif()
#determine the timeout for all the tests based on the backend. CUDA tests

2
vtkm/cont/serial/testing/CMakeLists.txt
View File

@ -32,4 +32,4 @@ set(unit_tests
UnitTestSerialPointLocatorUniformGrid.cxx
UnitTestSerialVirtualObjectHandle.cxx
)
vtkm_unit_tests(SOURCES ${unit_tests} BACKEND SERIAL)
vtkm_unit_tests(SOURCES ${unit_tests})

2
vtkm/cont/tbb/testing/CMakeLists.txt
View File

@ -33,4 +33,4 @@ set(unit_tests
UnitTestTBBVirtualObjectHandle.cxx
)
vtkm_unit_tests(SOURCES ${unit_tests} BACKEND TBB)
vtkm_unit_tests(SOURCES ${unit_tests})