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

update vtkm test arguments

Browse Source
This commit is contained in:
nadavi 2021-04-29 00:38:28 +00:00
parent 5fa8734bbc
commit 18d7827db7
2 changed files with 74 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMake/testing/VTKmTestWrappers.cmake
View File

@ -179,13 +179,13 @@ function(vtkm_unit_tests)
list(APPEND vtkm_default_test_log_level "--vtkm-log-level" "INFO")
# Add the path to the data directory so tests can find and use data files for testing
list(APPEND VTKm_UT_TEST_ARGS "--data-dir=${VTKm_SOURCE_DIR}/data/data")
list(APPEND VTKm_UT_TEST_ARGS "--vtkm-data-dir=${VTKm_SOURCE_DIR}/data/data")
# Add the path to the location where regression test images are to be stored
list(APPEND VTKm_UT_TEST_ARGS "--baseline-dir=${VTKm_SOURCE_DIR}/data/baseline")
list(APPEND VTKm_UT_TEST_ARGS "--vtkm-baseline-dir=${VTKm_SOURCE_DIR}/data/baseline")
# Add the path to the location where generated regression test images should be written
list(APPEND VTKm_UT_TEST_ARGS "--write-dir=${VTKm_BINARY_DIR}")
list(APPEND VTKm_UT_TEST_ARGS "--vtkm-write-dir=${VTKm_BINARY_DIR}")
if(VTKm_UT_MPI)
if (VTKm_ENABLE_MPI)

86
vtkm/cont/testing/Testing.h
View File

@ -65,9 +65,12 @@ namespace testing
enum TestOptionsIndex
{
TEST_UNKNOWN,
DATADIR, // base dir containing test data files
BASELINEDIR, // base dir for regression test images
WRITEDIR // base dir for generated regression test images
DATADIR, // base dir containing test data files
BASELINEDIR, // base dir for regression test images
WRITEDIR, // base dir for generated regression test images
DEPRECATED_DATADIR, // base dir containing test data files
DEPRECATED_BASELINEDIR, // base dir for regression test images
DEPRECATED_WRITEDIR // base dir for generated regression test images
};
struct TestVtkmArg : public opt::Arg
@ -245,7 +248,7 @@ private:
{
VTKM_LOG_S(
vtkm::cont::LogLevel::Error,
"TestDataBasePath was never set, was --data-dir set correctly? (hint: ../data/data)");
"TestDataBasePath was never set, was --vtkm-data-dir set correctly? (hint: ../data/data)");
}
return TestDataBasePath;
@ -267,9 +270,10 @@ private:
if (RegressionTestImageBasePath.empty())
{
VTKM_LOG_S(vtkm::cont::LogLevel::Error,
"RegressionTestImageBasePath was never set, was --baseline-dir set correctly? "
"(hint: ../data/baseline)");
VTKM_LOG_S(
vtkm::cont::LogLevel::Error,
"RegressionTestImageBasePath was never set, was --vtkm-baseline-dir set correctly? "
"(hint: ../data/baseline)");
}
return RegressionTestImageBasePath;
@ -299,19 +303,19 @@ private:
usage.push_back({ DATADIR,
0,
"D",
"data-dir",
"",
"vtkm-data-dir",
TestVtkmArg::Required,
" --data-dir, -D "
" --vtkm-data-dir "
"<data-dir-path> \tPath to the "
"base data directory in the VTK-m "
"src dir." });
usage.push_back({ BASELINEDIR,
0,
"B",
"baseline-dir",
"",
"vtkm-baseline-dir",
TestVtkmArg::Required,
" --baseline-dir, -B "
" --vtkm-baseline-dir "
"<baseline-dir-path> "
"\tPath to the base dir "
"for regression test "
@ -319,13 +323,38 @@ private:
usage.push_back({ WRITEDIR,
0,
"",
"write-dir",
"vtkm-write-dir",
TestVtkmArg::Required,
" --write-dir "
" --vtkm-write-dir "
"<write-dir-path> "
"\tPath to the write dir "
"to store generated "
"regression test images" });
usage.push_back({ DEPRECATED_DATADIR,
0,
"D",
"data-dir",
TestVtkmArg::Required,
" --data-dir "
"<data-dir-path> "
"\tDEPRECATED: use --vtkm-data-dir instead" });
usage.push_back({ DEPRECATED_BASELINEDIR,
0,
"B",
"baseline-dir",
TestVtkmArg::Required,
" --baseline-dir "
"<baseline-dir-path> "
"\tDEPRECATED: use --vtkm-baseline-dir instead" });
usage.push_back({ WRITEDIR,
0,
"",
"write-dir",
TestVtkmArg::Required,
" --write-dir "
"<write-dir-path> "
"\tDEPRECATED: use --vtkm-write-dir instead" });
// Required to collect unknown arguments when help is off.
usage.push_back({ TEST_UNKNOWN, 0, "", "", TestVtkmArg::Unknown, "" });
usage.push_back({ 0, 0, 0, 0, 0, 0 });
@ -346,6 +375,33 @@ private:
exit(1);
}
if (options[DEPRECATED_DATADIR])
{
VTKM_LOG_S(vtkm::cont::LogLevel::Error,
"Supplied deprecated datadir flag: "
<< std::string{ options[DEPRECATED_DATADIR].name }
<< ", use --vtkm-data-dir instead");
SetAndGetTestDataBasePath(options[DEPRECATED_DATADIR].arg);
}
if (options[DEPRECATED_BASELINEDIR])
{
VTKM_LOG_S(vtkm::cont::LogLevel::Error,
"Supplied deprecated baselinedir flag: "
<< std::string{ options[DEPRECATED_BASELINEDIR].name }
<< ", use --vtkm-baseline-dir instead");
SetAndGetRegressionImageBasePath(options[DEPRECATED_BASELINEDIR].arg);
}
if (options[DEPRECATED_WRITEDIR])
{
VTKM_LOG_S(vtkm::cont::LogLevel::Error,
"Supplied deprecated writedir flag: "
<< std::string{ options[DEPRECATED_WRITEDIR].name }
<< ", use --vtkm-write-dir instead");
SetAndGetWriteDirBasePath(options[DEPRECATED_WRITEDIR].arg);
}
if (options[DATADIR])
{
SetAndGetTestDataBasePath(options[DATADIR].arg);