Skip to content

Commit a10ee10

Browse files
committed
[T] Follow-up on Fix generation of invalid project files tests.
1 parent 7b26c58 commit a10ee10

File tree

2 files changed

+36
-37
lines changed

2 files changed

+36
-37
lines changed

ProcessLib/HT/Tests.cmake

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,3 +509,38 @@ AddTest(
509509
HeatTransportInStationaryFlow_ts_50_t_50000_000000_2.vtu HeatTransportInStationaryFlow_ts_50_t_50000_000000_2.vtu temperature temperature 1.e-9 1.0e-8
510510
HeatTransportInStationaryFlow_ts_50_t_50000_000000_2.vtu HeatTransportInStationaryFlow_ts_50_t_50000_000000_2.vtu pressure pressure 1.e-9 1.0e-8
511511
)
512+
513+
if(OGS_USE_PIP AND NOT OGS_USE_MPI)
514+
if(NOT EXISTS ${Data_SOURCE_DIR}/Parabolic/HT/InvalidProjectFiles/HT_specific_heat_capacity_viscosity_porosity.prj)
515+
execute_process(
516+
COMMAND
517+
uv run python
518+
${Data_SOURCE_DIR}/Parabolic/HT/InvalidProjectFiles/generateInvalidMediaForHT.py
519+
WORKING_DIRECTORY
520+
${Data_SOURCE_DIR}/Parabolic/HT/InvalidProjectFiles
521+
RESULT_VARIABLE GEN_INVALID_RES
522+
)
523+
if(GEN_INVALID_RES EQUAL 0)
524+
message(STATUS "generateInvalidMediaForHT.py succeeded.")
525+
else()
526+
message(SEND_ERROR "generateInvalidMediaForHT.py failed with status ${GEN_INVALID_RES}.")
527+
endif()
528+
endif()
529+
file(GLOB HT_INVALID_PRJ_FILES
530+
${Data_SOURCE_DIR}/Parabolic/HT/InvalidProjectFiles/*.prj
531+
)
532+
foreach(ht_invalid_prj_file ${HT_INVALID_PRJ_FILES})
533+
string(
534+
REPLACE ${Data_SOURCE_DIR}/Parabolic/HT/InvalidProjectFiles/HT
535+
"invalid" ht_invalid_prj_file_short
536+
${ht_invalid_prj_file}
537+
)
538+
AddTest(
539+
NAME HT_${ht_invalid_prj_file_short}
540+
PATH Parabolic/HT/InvalidProjectFiles
541+
EXECUTABLE ogs
542+
EXECUTABLE_ARGS ${ht_invalid_prj_file}
543+
RUNTIME 1 PROPERTIES WILL_FAIL TRUE
544+
)
545+
endforeach()
546+
endif()

scripts/cmake/PythonSetup.cmake

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,6 @@
11
# cmake-lint: disable=C0103
22
include(${PROJECT_SOURCE_DIR}/scripts/cmake/test/AddTest.cmake)
33

4-
# Sets up ctest that are dependent on the virtual env, e.g. using ogstools
5-
function(setup_venv_dependent_ctests)
6-
if(NOT OGS_USE_MPI AND OGS_BUILD_TESTING AND OGS_BUILD_PROCESS_HT)
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()
19-
endif()
20-
file(GLOB HT_INVALID_PRJ_FILES
21-
${Data_SOURCE_DIR}/Parabolic/HT/InvalidProjectFiles/*.prj
22-
)
23-
foreach(ht_invalid_prj_file ${HT_INVALID_PRJ_FILES})
24-
string(
25-
REPLACE ${Data_SOURCE_DIR}/Parabolic/HT/InvalidProjectFiles/HT
26-
"invalid" ht_invalid_prj_file_short
27-
${ht_invalid_prj_file}
28-
)
29-
AddTest(
30-
NAME HT_${ht_invalid_prj_file_short}
31-
PATH Parabolic/HT/InvalidProjectFiles
32-
EXECUTABLE ogs
33-
EXECUTABLE_ARGS ${ht_invalid_prj_file}
34-
RUNTIME 1 PROPERTIES WILL_FAIL TRUE
35-
)
36-
endforeach()
37-
endif()
38-
endfunction()
39-
404
message(STATUS "┌─ PythonSetup.cmake")
415
list(APPEND CMAKE_MESSAGE_INDENT "│ ")
426

@@ -95,7 +59,7 @@ if(OGS_USE_PIP)
9559
COMPONENTS ${_python_componets} REQUIRED)
9660
set(ENV{UV_PYTHON} ${Python_EXECUTABLE})
9761
endif()
98-
setup_venv_dependent_ctests()
62+
9963
# Create jupytext config
10064
file(
10165
WRITE

0 commit comments

Comments
 (0)