Commit 0365af01 authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'testing_run_requires_argc_argv'

c36b4543 Add UnitTestWorkletMapFieldWholeArrayAtomic
d6f66d17 Testing run methods now take argc/argv to init logging/runtime device
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland's avatarKenneth Moreland <kmorel@sandia.gov>
Merge-request: !1500
parents cbf913ad c36b4543
......@@ -47,7 +47,7 @@ void TestControlSignatures()
} // anonymous namespace
int UnitTestControlSignatureTag(int, char* [])
int UnitTestControlSignatureTag(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestControlSignatures);
return vtkm::cont::testing::Testing::Run(TestControlSignatures, argc, argv);
}
......@@ -89,7 +89,7 @@ void TestArrayInTransport()
} // Anonymous namespace
int UnitTestTransportArrayIn(int, char* [])
int UnitTestTransportArrayIn(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayInTransport);
return vtkm::cont::testing::Testing::Run(TestArrayInTransport, argc, argv);
}
......@@ -97,7 +97,7 @@ void TestArrayInOutTransport()
} // anonymous namespace
int UnitTestTransportArrayInOut(int, char* [])
int UnitTestTransportArrayInOut(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayInOutTransport);
return vtkm::cont::testing::Testing::Run(TestArrayInOutTransport, argc, argv);
}
......@@ -87,7 +87,7 @@ void TestArrayOutTransport()
} // Anonymous namespace
int UnitTestTransportArrayOut(int, char* [])
int UnitTestTransportArrayOut(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayOutTransport);
return vtkm::cont::testing::Testing::Run(TestArrayOutTransport, argc, argv);
}
......@@ -96,7 +96,7 @@ void UnitTestCellSetIn()
} // Anonymous namespace
int UnitTestTransportCellSetIn(int, char* [])
int UnitTestTransportCellSetIn(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(UnitTestCellSetIn);
return vtkm::cont::testing::Testing::Run(UnitTestCellSetIn, argc, argv);
}
......@@ -112,7 +112,7 @@ void TestExecObjectTransport()
} // Anonymous namespace
int UnitTestTransportExecObject(int, char* [])
int UnitTestTransportExecObject(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestExecObjectTransport);
return vtkm::cont::testing::Testing::Run(TestExecObjectTransport, argc, argv);
}
......@@ -207,7 +207,7 @@ void TestWholeArrayTransport()
} // Anonymous namespace
int UnitTestTransportWholeArray(int, char* [])
int UnitTestTransportWholeArray(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestWholeArrayTransport);
return vtkm::cont::testing::Testing::Run(TestWholeArrayTransport, argc, argv);
}
......@@ -87,7 +87,7 @@ void TestCheckArray()
} // anonymous namespace
int UnitTestTypeCheckArray(int, char* [])
int UnitTestTypeCheckArray(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestCheckArray);
return vtkm::cont::testing::Testing::Run(TestCheckArray, argc, argv);
}
......@@ -59,7 +59,7 @@ void TestCheckCellSet()
} // anonymous namespace
int UnitTestTypeCheckCellSet(int, char* [])
int UnitTestTypeCheckCellSet(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestCheckCellSet);
return vtkm::cont::testing::Testing::Run(TestCheckCellSet, argc, argv);
}
......@@ -55,7 +55,7 @@ void TestCheckExecObject()
} // anonymous namespace
int UnitTestTypeCheckExecObject(int, char* [])
int UnitTestTypeCheckExecObject(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestCheckExecObject);
return vtkm::cont::testing::Testing::Run(TestCheckExecObject, argc, argv);
}
......@@ -55,7 +55,7 @@ void TestCheckKeys()
} // anonymous namespace
int UnitTestTypeCheckKeys(int, char* [])
int UnitTestTypeCheckKeys(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestCheckKeys);
return vtkm::cont::testing::Testing::Run(TestCheckKeys, argc, argv);
}
......@@ -26,9 +26,10 @@
#include <vtkm/cont/cuda/DeviceAdapterCuda.h>
#include <vtkm/cont/testing/TestingArrayHandles.h>
int UnitTestCudaArrayHandle(int, char* [])
int UnitTestCudaArrayHandle(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagCuda>::Run();
return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagCuda>::Run(argc,
argv);
}
......@@ -28,11 +28,11 @@
#include <vtkm/cont/cuda/internal/testing/Testing.h>
#include <vtkm/cont/testing/TestingFancyArrayHandles.h>
int UnitTestCudaArrayHandleFancy(int, char* [])
int UnitTestCudaArrayHandleFancy(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
int result =
vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagCuda>::Run();
int result = vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagCuda>::Run(
argc, argv);
return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(result);
}
......@@ -26,10 +26,10 @@
#include <vtkm/cont/cuda/DeviceAdapterCuda.h>
#include <vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h>
int UnitTestCudaArrayHandleVirtualCoordinates(int, char* [])
int UnitTestCudaArrayHandleVirtualCoordinates(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::TestingArrayHandleVirtualCoordinates<
vtkm::cont::DeviceAdapterTagCuda>::Run();
vtkm::cont::DeviceAdapterTagCuda>::Run(argc, argv);
}
......@@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingCellLocatorRectilinearGrid.h>
int UnitTestCudaCellLocatorRectilinearGrid(int, char* [])
int UnitTestCudaCellLocatorRectilinearGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagCuda>());
TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagCuda>(), argc, argv);
}
......@@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h>
int UnitTestCudaCellLocatorTwoLevelUniformGrid(int, char* [])
int UnitTestCudaCellLocatorTwoLevelUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagCuda>);
TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagCuda>, argc, argv);
}
......@@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingCellLocatorUniformGrid.h>
int UnitTestCudaCellLocatorUniformGrid(int, char* [])
int UnitTestCudaCellLocatorUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagCuda>());
TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagCuda>(), argc, argv);
}
......@@ -27,9 +27,9 @@
#include <vtkm/cont/testing/TestingColorTable.h>
int UnitTestCudaColorTable(int, char* [])
int UnitTestCudaColorTable(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagCuda>::Run();
return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagCuda>::Run(argc, argv);
}
......@@ -28,10 +28,11 @@
#include <vtkm/cont/cuda/internal/testing/Testing.h>
#include <vtkm/cont/testing/TestingComputeRange.h>
int UnitTestCudaComputeRange(int, char* [])
int UnitTestCudaComputeRange(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
int result = vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagCuda>::Run();
int result =
vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagCuda>::Run(argc, argv);
return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(result);
}
......@@ -27,10 +27,11 @@
#include <vtkm/cont/cuda/internal/testing/Testing.h>
#include <vtkm/cont/testing/TestingDataSetExplicit.h>
int UnitTestCudaDataSetExplicit(int, char* [])
int UnitTestCudaDataSetExplicit(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
int result = vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagCuda>::Run();
int result =
vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagCuda>::Run(argc, argv);
return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(result);
}
......@@ -28,11 +28,11 @@
#include <vtkm/cont/cuda/internal/testing/Testing.h>
#include <vtkm/cont/testing/TestingDataSetSingleType.h>
int UnitTestCudaDataSetSingleType(int, char* [])
int UnitTestCudaDataSetSingleType(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
int result =
vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagCuda>::Run();
int result = vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagCuda>::Run(
argc, argv);
return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(result);
}
......@@ -28,10 +28,11 @@
#include <vtkm/cont/cuda/internal/testing/Testing.h>
#include <vtkm/cont/testing/TestingDeviceAdapter.h>
int UnitTestCudaDeviceAdapter(int, char* [])
int UnitTestCudaDeviceAdapter(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
int result = vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagCuda>::Run();
int result =
vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagCuda>::Run(argc, argv);
return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(result);
}
......@@ -29,10 +29,10 @@
#include <vtkm/cont/cuda/DeviceAdapterCuda.h>
#include <vtkm/testing/TestingGeometry.h>
int UnitTestCudaGeometry(int, char* [])
int UnitTestCudaGeometry(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::Testing::Run(
UnitTestGeometryNamespace::RunGeometryTests<vtkm::cont::DeviceAdapterTagCuda>);
UnitTestGeometryNamespace::RunGeometryTests<vtkm::cont::DeviceAdapterTagCuda>, argc, argv);
}
......@@ -36,9 +36,9 @@ void TestImplicitFunctions()
} // anonymous namespace
int UnitTestCudaImplicitFunction(int, char* [])
int UnitTestCudaImplicitFunction(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::Testing::Run(TestImplicitFunctions);
return vtkm::cont::testing::Testing::Run(TestImplicitFunctions, argc, argv);
}
......@@ -180,14 +180,15 @@ void RunEdgeCases()
} //namespace
int UnitTestCudaMath(int, char* [])
int UnitTestCudaMath(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
int tests_valid = vtkm::cont::testing::Testing::Run(
UnitTestMathNamespace::RunMathTests<vtkm::cont::DeviceAdapterTagCuda>);
UnitTestMathNamespace::RunMathTests<vtkm::cont::DeviceAdapterTagCuda>, argc, argv);
tests_valid += vtkm::cont::testing::Testing::Run(RunEdgeCases<vtkm::cont::DeviceAdapterTagCuda>);
tests_valid +=
vtkm::cont::testing::Testing::Run(RunEdgeCases<vtkm::cont::DeviceAdapterTagCuda>, argc, argv);
return tests_valid;
}
......@@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingPointLocatorUniformGrid.h>
int UnitTestCudaPointLocatorUniformGrid(int, char* [])
int UnitTestCudaPointLocatorUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::Testing::Run(
TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagCuda>());
TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagCuda>(), argc, argv);
}
......@@ -280,10 +280,10 @@ void Launch()
} // end anon namespace
int UnitTestCudaShareUserProvidedManagedMemory(int, char* [])
int UnitTestCudaShareUserProvidedManagedMemory(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
int ret = vtkm::cont::testing::Testing::Run(Launch);
int ret = vtkm::cont::testing::Testing::Run(Launch, argc, argv);
return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(ret);
}
......@@ -44,7 +44,7 @@ void TestVirtualObjectHandle()
} // anonymous namespace
int UnitTestCudaVirtualObjectHandle(int, char* [])
int UnitTestCudaVirtualObjectHandle(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestVirtualObjectHandle);
return vtkm::cont::testing::Testing::Run(TestVirtualObjectHandle, argc, argv);
}
......@@ -162,7 +162,7 @@ void TestArrayManagerShare()
} // Anonymous namespace
int UnitTestArrayManagerExecutionShareWithControl(int, char* [])
int UnitTestArrayManagerExecutionShareWithControl(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayManagerShare);
return vtkm::cont::testing::Testing::Run(TestArrayManagerShare, argc, argv);
}
......@@ -160,7 +160,7 @@ void TestArrayPortalFromIterators()
} // Anonymous namespace
int UnitTestArrayPortalFromIterators(int, char* [])
int UnitTestArrayPortalFromIterators(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayPortalFromIterators);
return vtkm::cont::testing::Testing::Run(TestArrayPortalFromIterators, argc, argv);
}
......@@ -200,7 +200,7 @@ void TestDynamicTransform()
} // anonymous namespace
int UnitTestDynamicTransform(int, char* [])
int UnitTestDynamicTransform(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestDynamicTransform);
return vtkm::cont::testing::Testing::Run(TestDynamicTransform, argc, argv);
}
......@@ -163,7 +163,7 @@ void TestArrayIteratorFromArrayPortal()
} // Anonymous namespace
int UnitTestIteratorFromArrayPortal(int, char* [])
int UnitTestIteratorFromArrayPortal(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayIteratorFromArrayPortal);
return vtkm::cont::testing::Testing::Run(TestArrayIteratorFromArrayPortal, argc, argv);
}
......@@ -23,9 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingArrayHandles.h>
int UnitTestOpenMPArrayHandle(int, char* [])
int UnitTestOpenMPArrayHandle(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagOpenMP>::Run();
return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc,
argv);
}
......@@ -23,9 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingFancyArrayHandles.h>
int UnitTestOpenMPArrayHandleFancy(int, char* [])
int UnitTestOpenMPArrayHandleFancy(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagOpenMP>::Run();
return vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagOpenMP>::Run(
argc, argv);
}
......@@ -23,10 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h>
int UnitTestOpenMPArrayHandleVirtualCoordinates(int, char* [])
int UnitTestOpenMPArrayHandleVirtualCoordinates(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingArrayHandleVirtualCoordinates<
vtkm::cont::DeviceAdapterTagOpenMP>::Run();
vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc, argv);
}
......@@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingCellLocatorRectilinearGrid.h>
int UnitTestOpenMPCellLocatorRectilinearGrid(int, char* [])
int UnitTestOpenMPCellLocatorRectilinearGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagSerial>());
TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagSerial>(), argc, argv);
}
......@@ -23,10 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h>
int UnitTestOpenMPCellLocatorTwoLevelUniformGrid(int, char* [])
int UnitTestOpenMPCellLocatorTwoLevelUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagOpenMP>);
TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagOpenMP>, argc, argv);
}
......@@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingCellLocatorUniformGrid.h>
int UnitTestOpenMPCellLocatorUniformGrid(int, char* [])
int UnitTestOpenMPCellLocatorUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagSerial>());
TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagSerial>(), argc, argv);
}
......@@ -23,9 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingColorTable.h>
int UnitTestOpenMPColorTable(int, char* [])
int UnitTestOpenMPColorTable(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagOpenMP>::Run();
return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc,
argv);
}
......@@ -23,9 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingComputeRange.h>
int UnitTestOpenMPComputeRange(int, char* [])
int UnitTestOpenMPComputeRange(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagOpenMP>::Run();
return vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc,
argv);
}
......@@ -23,9 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingDataSetExplicit.h>
int UnitTestOpenMPDataSetExplicit(int, char* [])
int UnitTestOpenMPDataSetExplicit(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagOpenMP>::Run();
return vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc,
argv);
}
......@@ -23,9 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingDataSetSingleType.h>
int UnitTestOpenMPDataSetSingleType(int, char* [])
int UnitTestOpenMPDataSetSingleType(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagOpenMP>::Run();
return vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagOpenMP>::Run(
argc, argv);
}
......@@ -24,9 +24,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingDeviceAdapter.h>
int UnitTestOpenMPDeviceAdapter(int, char* [])
int UnitTestOpenMPDeviceAdapter(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagOpenMP>::Run();
return vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc,
argv);
}
......@@ -37,7 +37,7 @@ void TestImplicitFunctions()
} // anonymous namespace
int UnitTestOpenMPImplicitFunction(int, char* [])
int UnitTestOpenMPImplicitFunction(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestImplicitFunctions);
return vtkm::cont::testing::Testing::Run(TestImplicitFunctions, argc, argv);
}
......@@ -23,10 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingPointLocatorUniformGrid.h>
int UnitTestOpenMPPointLocatorUniformGrid(int, char* [])
int UnitTestOpenMPPointLocatorUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::Testing::Run(
TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagOpenMP>());
TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagOpenMP>(), argc, argv);
}
......@@ -44,7 +44,7 @@ void TestVirtualObjectHandle()
} // anonymous namespace