Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Testsuite: use ./serial subdirectory #16551

Merged
merged 2 commits into from
Jan 27, 2024
Merged

Testsuite: use ./serial subdirectory #16551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d3a63f
CMake: update comments
tamiko Jan 26, 2024
7da98f6
CMake: deal_ii_add_test(): use ./serial subdirectory for output of se…
tamiko Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions cmake/macros/macro_deal_ii_add_test.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
#
# The following variables must be set:
#
# BASH
# BASH
# - Complete path to the bash shell.
#
# NUMDIFF_EXECUTABLE
Expand All @@ -92,8 +92,7 @@
# to 0.
#
# ENABLE_PERFORMANCE_TESTS
# - If defined and set to true the execution of performance tests will
# be enabled.
# - If set to true the execution of performance tests will be enabled.
#
# TESTING_ENVIRONMENT
# - Specifies the performance test testing environment. Valid options
Expand Down Expand Up @@ -408,6 +407,10 @@ function(deal_ii_add_test _category _test_name _comparison_file)
set(_test_full ${_category}/${_test_name}) # full test name
set(_test_directory ${CMAKE_CURRENT_BINARY_DIR}/${_test_name}.${_build_lowercase}) # directory to run the test in

if("${_n_cpu}" STREQUAL "0" AND "${_n_threads}" STREQUAL "0")
string(APPEND _test_directory "/serial")
endif()

if(NOT "${_n_cpu}" STREQUAL "0")
string(APPEND _test_target ".mpirun${_n_cpu}")
string(APPEND _test_full ".mpirun=${_n_cpu}")
Expand Down
6 changes: 3 additions & 3 deletions cmake/macros/macro_deal_ii_pickup_tests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
# If TEST_PICKUP_REGEX is set, only tests matching the regex will be
# processed.
#
# Furthermore, the macro sets up (if necessary) deal.II, perl, numdiff,
# and the following variables, that can be overwritten by environment or
# command line:
# Furthermore, the macro sets up (if necessary) deal.II, bash, perl,
# numdiff, and the following variables, that can be overwritten by
# environment or command line:
#
# TEST_LIBRARIES
# TEST_LIBRARIES_DEBUG
Expand Down