From aa76b6bd8bfaa7bb43e5bf24be580ff435d758ba Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 21 Feb 2023 15:09:09 +0100
Subject: [PATCH] [cmake,T] Removed RESOURCE_LOCK PYVISTA.
---
ProcessLib/PhaseField/Tests.cmake | 2 +-
scripts/cmake/test/NotebookTest.cmake | 9 ---------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/ProcessLib/PhaseField/Tests.cmake b/ProcessLib/PhaseField/Tests.cmake
index 17dfceaa1df..8413d8ecece 100644
--- a/ProcessLib/PhaseField/Tests.cmake
+++ b/ProcessLib/PhaseField/Tests.cmake
@@ -141,6 +141,6 @@ if(OGS_USE_PETSC)
NotebookTest(NOTEBOOKFILE PhaseField/surfing_jupyter_notebook/surfing_pyvista.ipynb RUNTIME 25)
NotebookTest(NOTEBOOKFILE PhaseField/beam_jupyter_notebook/beam.ipynb RUNTIME 500 PROPERTIES PROCESSORS 3)
NotebookTest(NOTEBOOKFILE PhaseField/tpb_jupyter_notebook/TPB.ipynb RUNTIME 110 PROPERTIES PROCESSORS 4)
- NotebookTest(NOTEBOOKFILE PhaseField/kregime_jupyter_notebook/Kregime_Static_jupyter.ipynb RUNTIME 40 RESOURCE_LOCK PYVISTA)
+ NotebookTest(NOTEBOOKFILE PhaseField/kregime_jupyter_notebook/Kregime_Static_jupyter.ipynb RUNTIME 40)
NotebookTest(NOTEBOOKFILE PhaseField/PForthotropy_jupyter_notebook/sen_shear.ipynb RUNTIME 500 PROPERTIES PROCESSORS 4)
endif()
diff --git a/scripts/cmake/test/NotebookTest.cmake b/scripts/cmake/test/NotebookTest.cmake
index 1e8d71da36e..4ab81079187 100644
--- a/scripts/cmake/test/NotebookTest.cmake
+++ b/scripts/cmake/test/NotebookTest.cmake
@@ -12,15 +12,6 @@ function(NotebookTest)
NotebookTest "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}
)
- if(APPLE AND DEFINED ENV{CI} AND "PYVISTA" IN_LIST
- NotebookTest_RESOURCE_LOCK
- )
- message("Disabled NotebookTest ${NotebookTest_NOTEBOOKFILE} because "
- "PyVista in CI on mac is not supported (headless)."
- )
- return()
- endif()
-
get_filename_component(
NotebookTest_DIR "${NotebookTest_NOTEBOOKFILE}" DIRECTORY
)
--
GitLab