Skip to content

Commit c26ba70

Browse files
author
Roberto Di Remigio
committed
Fraction input tests
1 parent b332a02 commit c26ba70

File tree

6 files changed

+420
-326
lines changed

6 files changed

+420
-326
lines changed

tests/input/CMakeLists.txt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,27 @@ endif()
55

66
# Copy input files to ${PROJECT_BINARY_DIR}/tests/input (aka ${CMAKE_CURRENT_BINARY_DIR})
77
file(COPY diffuse.inp restart.inp tsless.inp wavelet.inp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
8-
# Tests pcmsolver.py
8+
99
add_test(NAME parser_script-diffuse COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/bin/pcmsolver.py diffuse.inp
1010
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
1111
set_tests_properties(parser_script-diffuse PROPERTIES LABELS "parser_script" DEPENDS generate-pcmsolver-py)
12+
add_Catch_test(input_diffuse "input;diffuse")
13+
set_tests_properties(input_diffuse PROPERTIES DEPENDS parser_script-diffuse)
14+
1215
add_test(NAME parser_script-restart COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/bin/pcmsolver.py restart.inp
1316
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
1417
set_tests_properties(parser_script-restart PROPERTIES LABELS "parser_script" DEPENDS generate-pcmsolver-py)
18+
add_Catch_test(input_restart "input;restart")
19+
set_tests_properties(input_restart PROPERTIES DEPENDS parser_script-restart)
20+
1521
add_test(NAME parser_script-tsless COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/bin/pcmsolver.py tsless.inp
1622
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
1723
set_tests_properties(parser_script-tsless PROPERTIES LABELS "parser_script" DEPENDS generate-pcmsolver-py)
24+
add_Catch_test(input_tsless "input;tsless")
25+
set_tests_properties(input_tsless PROPERTIES DEPENDS parser_script-tsless)
26+
1827
add_test(NAME parser_script-wavelet COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/bin/pcmsolver.py wavelet.inp
1928
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
2029
set_tests_properties(parser_script-wavelet PROPERTIES LABELS "parser_script" DEPENDS generate-pcmsolver-py)
21-
22-
# input.cpp test
23-
add_Catch_test(input "input")
24-
set_tests_properties(input PROPERTIES DEPENDS parser_script-diffuse
25-
DEPENDS parser_script-restart
26-
DEPENDS parser_script-tsless
27-
DEPENDS parser_script-wavelet)
30+
add_Catch_test(input_wavelet "input;wavelet")
31+
set_tests_properties(input_wavelet PROPERTIES DEPENDS parser_script-wavelet)

tests/input/input.cpp

Lines changed: 0 additions & 318 deletions
This file was deleted.

0 commit comments

Comments
 (0)