Commit f5d3f583 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot
Browse files

Merge topic 'dashboard-fixes'

ee4f40cf warnings: fix Q_ASSERT related warnings.
aa176281 perf:  import reduce all code
f1f37161 TestCleanArrays: fix imports
ebebc0fb cmake: fix arguments to TestCleanArrays.
cbb545e4 fix mpi-based batch tests.
afd3d131 cmake: enable ParallelMPI4Py module when appropriate
a3c090fc fix python view tests
e4bb0e05

 update vtk
...
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Cory Quammen's avatarCory Quammen <cory.quammen@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !3049
parents 2bc7f125 ee4f40cf
......@@ -35,7 +35,7 @@ if arrayRange[0] < 237 or arrayRange[0] > 238 or arrayRange[1] < 476 or arrayRan
# now try with the can.ex2 exodus file for multiblock testing
for i, arg in enumerate(sys.argv):
if arg == "-D" and i+1 < len(sys.argv):
dataFile = sys.argv[i+1] + '/can.ex2'
dataFile = sys.argv[i+1] + '/Testing/Data/can.ex2'
canex2 = ExodusIIReader(FileName=[dataFile])
canex2.ElementVariables = ['EQPS']
......
......@@ -7,45 +7,45 @@ set(_vtk_build_test "paraview")
set(${_vtk_build_test}_TEST_LABELS paraview)
ExternalData_Expand_Arguments(ParaViewData _
# data files
"DATA{${paraview_test_data_directory_input}/Data/can.ex2}"
"DATA{${paraview_test_data_directory_input}/Data/multicomb_0.vts}")
"DATA{${paraview_test_data_directory_input}/Data/multicomb_0.vts}"
# baselines
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestPythonViewMatplotlibScript.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestPythonViewNumpyScript.png}"
)
# only enable TestPythonAnnotationFilter test if numpy is available
find_python_module(numpy numpy_found)
if (numpy_found)
set(paraview_python_args
--data=${paraview_test_data_directory_output}/can.ex2)
# Add pvpython tests
paraview_add_test_python(
NO_DATA NO_VALID NO_OUTPUT NO_RT
TestPythonAnnotationFilter.py
TestPythonAnnotationFilterNoMerge.py
NO_DATA NO_VALID NO_RT
TestAnnotateAttributeData.py
CinemaAERTest.py
)
paraview_add_test_python(
NO_VALID NO_OUTPUT NO_RT
AppendAttributes.py
UnstructuredCellTypePythonCalculator.py
NO_DATA NO_RT
TestPythonViewNumpyScript.py
)
paraview_add_test_python(
NO_VALID NO_RT
AppendAttributes.py
FileSeriesWriterSubTimeSteps.py
TestPythonAnnotationFilterNoMerge.py
TestPythonAnnotationFilter.py
UnstructuredCellTypePythonCalculator.py
)
unset(paraview_python_args)
if (PARAVIEW_ENABLE_MATPLOTLIB AND matplotlib_found)
if (matplotlib_found)
# add Matplotlib tests only if matplotlib was found at configure time.
paraview_add_test_python(
NO_DATA NO_RT
TestPythonViewMatplotlibScript.py
)
endif()
paraview_add_test_python(
NO_DATA NO_RT
TestPythonViewNumpyScript.py
)
endif()
paraview_add_test_python(
......@@ -92,9 +92,9 @@ foreach (tfile IN LISTS PVBATCH_TESTS)
set(${test}_ARGS
--state ${CMAKE_CURRENT_SOURCE_DIR}/${test}.pvsm)
endforeach ()
if (PARAVIEW_USE_MPI AND VTK_MPIRUN_EXE)
if (PARAVIEW_USE_MPI AND MPIEXEC_EXECUTABLE)
# run the tests in parallel
set(${}_NUMPROCS 3)
set(${_vtk_build_test}_NUMPROCS 3)
paraview_add_test_pvbatch_mpi(
JUST_VALID
${PVBATCH_TESTS}
......
......@@ -5,7 +5,7 @@ dataFile = None
tempDir = None
for i, arg in enumerate(sys.argv):
if arg == "-D" and i+1 < len(sys.argv):
dataFile = sys.argv[i+1] + '/can.ex2'
dataFile = sys.argv[i+1] + '/Testing/Data/can.ex2'
elif arg == "-T" and i+1 < len(sys.argv):
tempDir = sys.argv[i+1]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment