Skip to content

Commit 7b26c58

Browse files
committed
[T] Fix generation of invalid project files tests.
1 parent 2156a1b commit 7b26c58

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

scripts/cmake/PythonSetup.cmake

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
# cmake-lint: disable=C0103
2+
include(${PROJECT_SOURCE_DIR}/scripts/cmake/test/AddTest.cmake)
23

34
# Sets up ctest that are dependent on the virtual env, e.g. using ogstools
45
function(setup_venv_dependent_ctests)
56
if(NOT OGS_USE_MPI AND OGS_BUILD_TESTING AND OGS_BUILD_PROCESS_HT)
6-
execute_process(
7-
COMMAND
8-
uv run python
9-
${Data_SOURCE_DIR}/Parabolic/HT/InvalidProjectFiles/generateInvalidMediaForHT.py
10-
WORKING_DIRECTORY
11-
${Data_SOURCE_DIR}/Parabolic/HT/InvalidProjectFiles
12-
RESULT_VARIABLE GEN_INVALID_RES
13-
)
14-
if(NOT GEN_INVALID_RES EQUAL 0)
15-
message(SEND_ERROR "generateInvalidMediaForHT.py failed with status ${GEN_INVALID_RES}.")
7+
if(NOT EXISTS ${Data_SOURCE_DIR}/Parabolic/HT/InvalidProjectFiles/HT_specific_heat_capacity_viscosity_porosity.prj)
8+
execute_process(
9+
COMMAND
10+
uv run python
11+
${Data_SOURCE_DIR}/Parabolic/HT/InvalidProjectFiles/generateInvalidMediaForHT.py
12+
WORKING_DIRECTORY
13+
${Data_SOURCE_DIR}/Parabolic/HT/InvalidProjectFiles
14+
RESULT_VARIABLE GEN_INVALID_RES
15+
)
16+
if(NOT GEN_INVALID_RES EQUAL 0)
17+
message(SEND_ERROR "generateInvalidMediaForHT.py failed with status ${GEN_INVALID_RES}.")
18+
endif()
1619
endif()
1720
file(GLOB HT_INVALID_PRJ_FILES
1821
${Data_SOURCE_DIR}/Parabolic/HT/InvalidProjectFiles/*.prj
@@ -87,13 +90,12 @@ if(OGS_USE_PIP)
8790
"To disable uv set OGS_USE_PIP=OFF."
8891
)
8992
endif()
90-
91-
setup_venv_dependent_ctests()
9293
else()
9394
find_package(Python ${ogs.minimum_version.python}...<3.14
9495
COMPONENTS ${_python_componets} REQUIRED)
9596
set(ENV{UV_PYTHON} ${Python_EXECUTABLE})
9697
endif()
98+
setup_venv_dependent_ctests()
9799
# Create jupytext config
98100
file(
99101
WRITE

0 commit comments

Comments
 (0)