summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2023-11-15 23:31:26 (GMT)
committerGitHub <noreply@github.com>2023-11-15 23:31:26 (GMT)
commitfe49c075ac906f10fbcb08badcc68a8d79d216f1 (patch)
tree990e7b2a1a1b9580cd8d57a8cdb557aa986bc33e /config
parentc779464bfe3dabd767144526a868a5b06538161f (diff)
downloadhdf5-fe49c075ac906f10fbcb08badcc68a8d79d216f1.zip
hdf5-fe49c075ac906f10fbcb08badcc68a8d79d216f1.tar.gz
hdf5-fe49c075ac906f10fbcb08badcc68a8d79d216f1.tar.bz2
Fixes for CI and presets (#3853)
Diffstat (limited to 'config')
-rw-r--r--config/cmake-presets/hidden-presets.json2
-rw-r--r--config/cmake/grepTest.cmake18
2 files changed, 11 insertions, 9 deletions
diff --git a/config/cmake-presets/hidden-presets.json b/config/cmake-presets/hidden-presets.json
index 81ac98f..3d61ebc 100644
--- a/config/cmake-presets/hidden-presets.json
+++ b/config/cmake-presets/hidden-presets.json
@@ -528,7 +528,7 @@
"generators": [
"ZIP"
],
- "configurations": ["Release"]
+ "configurations": ["RelWithDebInfo"]
},
{
"name": "ci-x64-Release-Clang",
diff --git a/config/cmake/grepTest.cmake b/config/cmake/grepTest.cmake
index 6e51dec..2ec8387 100644
--- a/config/cmake/grepTest.cmake
+++ b/config/cmake/grepTest.cmake
@@ -71,8 +71,8 @@ message (STATUS "COMMAND Error: ${TEST_ERROR}")
# remove special output
file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
-string (FIND TEST_STREAM "_pmi_alps" "${TEST_FIND_RESULT}")
-if (TEST_FIND_RESULT GREATER 0)
+string (FIND TEST_STREAM "_pmi_alps" TEST_FIND_RESULT)
+if (TEST_FIND_RESULT GREATER -1)
string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_STREAM})
endif ()
@@ -169,12 +169,14 @@ else ()
# else grep the output with the reference
set (TEST_GREP_RESULT 0)
file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
-
- # TEST_REFERENCE should always be matched
- string (REGEX MATCH "${TEST_REFERENCE}" TEST_MATCH ${TEST_STREAM})
- string (COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_GREP_RESULT)
- if (NOT TEST_GREP_RESULT)
- message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
+ list (LENGTH TEST_STREAM test_len)
+ if (test_len GREATER 0)
+ # TEST_REFERENCE should always be matched
+ string (REGEX MATCH "${TEST_REFERENCE}" TEST_MATCH ${TEST_STREAM})
+ string (COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_GREP_RESULT)
+ if (NOT TEST_GREP_RESULT)
+ message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
+ endif ()
endif ()
endif ()