From 6ccf1e781b95c6e533d19c4426a1f140b776548a Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 20 Aug 2024 13:39:15 +0200
Subject: [PATCH] [cmake] Formatting.
---
scripts/cmake/test/AddTest.cmake | 54 +++++++++++++++++++++-----------
scripts/cmake/test/OgsTest.cmake | 5 ++-
2 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index 209c77e21e8..81e7d2e7c1b 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -99,8 +99,9 @@ function(AddTest)
if(NOT DEFINED AddTest_RUNTIME)
set(AddTest_RUNTIME 1)
elseif(AddTest_RUNTIME GREATER 750)
- # Set a timeout on jobs larger than the default ctest timeout of 1500 (s).
- # The allowed runtime is twice as long as the given RUNTIME parameter.
+ # Set a timeout on jobs larger than the default ctest timeout of 1500
+ # (s). The allowed runtime is twice as long as the given RUNTIME
+ # parameter.
math(EXPR timeout "${AddTest_RUNTIME} * 2")
set(timeout TIMEOUT ${timeout})
endif()
@@ -346,7 +347,10 @@ macro(_add_test TEST_NAME)
endif()
isTestCommandExpectedToSucceed(${TEST_NAME} ${AddTest_PROPERTIES})
- message(DEBUG "Is test '${TEST_NAME}' expected to succeed? → ${TEST_COMMAND_IS_EXPECTED_TO_SUCCEED}")
+ message(
+ DEBUG
+ "Is test '${TEST_NAME}' expected to succeed? → ${TEST_COMMAND_IS_EXPECTED_TO_SUCCEED}"
+ )
add_test(
NAME ${TEST_NAME}
@@ -613,17 +617,17 @@ Use six arguments version of AddTest with absolute and relative tolerances"
endmacro()
# Checks if a test is expected to succeed based on the properties WILL_FAIL,
-# PASS_REGULAR_EXPRESSION and FAIL_REGULAR_EXPRESSION.
-# The function expects the test name (used only for debugging purposes) and the
-# test properties as arguments.
-# The test does not need to exist, yet. This function does not query any test
-# case, but only uses the passed list of properties
+# PASS_REGULAR_EXPRESSION and FAIL_REGULAR_EXPRESSION. The function expects the
+# test name (used only for debugging purposes) and the test properties as
+# arguments. The test does not need to exist, yet. This function does not query
+# any test case, but only uses the passed list of properties
function(isTestCommandExpectedToSucceed TEST_NAME)
set(options WILL_FAIL)
set(oneValueArgs PASS_REGULAR_EXPRESSION FAIL_REGULAR_EXPRESSION)
set(multiValueArgs)
- cmake_parse_arguments(TEST_FAILURE "${options}" "${oneValueArgs}"
- "${multiValueArgs}" ${ARGN})
+ cmake_parse_arguments(
+ TEST_FAILURE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}
+ )
message(DEBUG "failure properties for test ${TEST_NAME}:")
list(APPEND CMAKE_MESSAGE_INDENT " ")
@@ -632,20 +636,30 @@ function(isTestCommandExpectedToSucceed TEST_NAME)
message(DEBUG "FAIL_RE: ${TEST_FAILURE_FAIL_REGULAR_EXPRESSION}")
list(POP_BACK CMAKE_MESSAGE_INDENT)
- if (${TEST_FAILURE_WILL_FAIL})
- if (DEFINED TEST_FAILURE_PASS_REGULAR_EXPRESSION)
+ if(${TEST_FAILURE_WILL_FAIL})
+ if(DEFINED TEST_FAILURE_PASS_REGULAR_EXPRESSION)
# Note: if the test property PASS_REGULAR_EXPRESSION is set, the
- # process return code will be ignored, see https://cmake.org/cmake/help/latest/prop_test/PASS_REGULAR_EXPRESSION.html
- message(SEND_ERROR "Error in test '${TEST_NAME}': Please do not use both WILL_FAIL and PASS_REGULAR_EXPRESSION in the same test. The logic will be unclear, then.")
+ # process return code will be ignored, see
+ # https://cmake.org/cmake/help/latest/prop_test/PASS_REGULAR_EXPRESSION.html
+ message(
+ SEND_ERROR
+ "Error in test '${TEST_NAME}': Please do not use both WILL_FAIL and PASS_REGULAR_EXPRESSION in the same test. The logic will be unclear, then."
+ )
endif()
- if (DEFINED TEST_FAILURE_FAIL_REGULAR_EXPRESSION)
- message(SEND_ERROR "Error in test '${TEST_NAME}': Please do not use both WILL_FAIL and FAIL_REGULAR_EXPRESSION in the same test. The logic will be unclear, then.")
+ if(DEFINED TEST_FAILURE_FAIL_REGULAR_EXPRESSION)
+ message(
+ SEND_ERROR
+ "Error in test '${TEST_NAME}': Please do not use both WILL_FAIL and FAIL_REGULAR_EXPRESSION in the same test. The logic will be unclear, then."
+ )
endif()
set(TEST_COMMAND_IS_EXPECTED_TO_SUCCEED false)
elseif(DEFINED TEST_FAILURE_PASS_REGULAR_EXPRESSION)
- if (DEFINED TEST_FAILURE_FAIL_REGULAR_EXPRESSION)
- message(SEND_ERROR "Error in test '${TEST_NAME}': Please do not use both PASS_REGULAR_EXPRESSION and FAIL_REGULAR_EXPRESSION in the same test. The logic will be unclear, then.")
+ if(DEFINED TEST_FAILURE_FAIL_REGULAR_EXPRESSION)
+ message(
+ SEND_ERROR
+ "Error in test '${TEST_NAME}': Please do not use both PASS_REGULAR_EXPRESSION and FAIL_REGULAR_EXPRESSION in the same test. The logic will be unclear, then."
+ )
endif()
set(TEST_COMMAND_IS_EXPECTED_TO_SUCCEED false)
@@ -653,5 +667,7 @@ function(isTestCommandExpectedToSucceed TEST_NAME)
set(TEST_COMMAND_IS_EXPECTED_TO_SUCCEED true)
endif()
- set(TEST_COMMAND_IS_EXPECTED_TO_SUCCEED "${TEST_COMMAND_IS_EXPECTED_TO_SUCCEED}" PARENT_SCOPE)
+ set(TEST_COMMAND_IS_EXPECTED_TO_SUCCEED
+ "${TEST_COMMAND_IS_EXPECTED_TO_SUCCEED}" PARENT_SCOPE
+ )
endfunction()
diff --git a/scripts/cmake/test/OgsTest.cmake b/scripts/cmake/test/OgsTest.cmake
index 596e908ab2e..a947442af8a 100644
--- a/scripts/cmake/test/OgsTest.cmake
+++ b/scripts/cmake/test/OgsTest.cmake
@@ -103,7 +103,10 @@ macro(_ogs_add_test TEST_NAME)
string(REPLACE "/" "_" TEST_NAME_UNDERSCORE ${TEST_NAME})
isTestCommandExpectedToSucceed(${TEST_NAME} ${OgsTest_PROPERTIES})
- message(DEBUG "Is test '${TEST_NAME}' expected to succeed? → ${TEST_COMMAND_IS_EXPECTED_TO_SUCCEED}")
+ message(
+ DEBUG
+ "Is test '${TEST_NAME}' expected to succeed? → ${TEST_COMMAND_IS_EXPECTED_TO_SUCCEED}"
+ )
add_test(
NAME ${TEST_NAME}
--
GitLab