From 0ea4a6473c2b3c7ec849e9f5a22198e86ea30a22 Mon Sep 17 00:00:00 2001 From: Ben Boeckel <ben.boeckel@kitware.com> Date: Tue, 3 Dec 2024 14:39:31 -0500 Subject: [PATCH] Rendering/Parallel/Testing: fix `TestClientServerRendering` execution Use the new `FindPython3` module's variable for the Python executable. Fixes: #19544 --- .gitlab/ci/ctest_exclusions.cmake | 4 +--- Rendering/Parallel/Testing/Cxx/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab/ci/ctest_exclusions.cmake b/.gitlab/ci/ctest_exclusions.cmake index ace58550a79..7efa80a0c28 100644 --- a/.gitlab/ci/ctest_exclusions.cmake +++ b/.gitlab/ci/ctest_exclusions.cmake @@ -2,9 +2,7 @@ set(test_exclusions # Flaky when run with threads enabled. See #19471. "^VTK::FiltersCellGridCxx-TestCellGridEvaluator$" # https://gitlab.kitware.com/vtk/vtk/-/issues/19427 - "^VTK::RenderingOpenGL2Cxx-TestGlyph3DMapperPickability$" - # https://gitlab.kitware.com/vtk/vtk/-/issues/19544 - "^vtkRenderingParallel-TestClientServerRendering$") + "^VTK::RenderingOpenGL2Cxx-TestGlyph3DMapperPickability$") if (NOT "$ENV{CMAKE_CONFIGURATION}" MATCHES "windows") list(APPEND test_exclusions diff --git a/Rendering/Parallel/Testing/Cxx/CMakeLists.txt b/Rendering/Parallel/Testing/Cxx/CMakeLists.txt index 59e21c39db0..b2e45a84436 100644 --- a/Rendering/Parallel/Testing/Cxx/CMakeLists.txt +++ b/Rendering/Parallel/Testing/Cxx/CMakeLists.txt @@ -23,7 +23,7 @@ if (Python3_EXECUTABLE) ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME vtkRenderingParallel-TestClientServerRendering - COMMAND ${PYTHON_EXECUTABLE} + COMMAND ${Python3_EXECUTABLE} ${VTK_SOURCE_DIR}/CMake/vtkTestDriver.py --process $<TARGET_FILE:vtkRenderingParallel-TestClientServerRendering> -- GitLab