diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-12-31 19:00:39 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-12-31 19:00:39 (GMT) |
| commit | a8437787596fb8f6ff61427e76122bc4c996009c (patch) | |
| tree | 662abd22e36bb1089680c94f6da1ae71c6ea6c8e /config | |
| parent | 17d5f51bed455c47cdeecd0afcc71b73b873ae55 (diff) | |
| download | hdf5-a8437787596fb8f6ff61427e76122bc4c996009c.zip hdf5-a8437787596fb8f6ff61427e76122bc4c996009c.tar.gz hdf5-a8437787596fb8f6ff61427e76122bc4c996009c.tar.bz2 | |
HDFFV-10669 merge from develop
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake_ext_mod/runTest.cmake | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake index 8181ff0..026131b 100644 --- a/config/cmake_ext_mod/runTest.cmake +++ b/config/cmake_ext_mod/runTest.cmake @@ -97,10 +97,10 @@ if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err) string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}") if (NOT ERROR_APPEND) - # append error output to the stdout output file + # write back to original .err file file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}") else () - # write back to original .err file + # append error output to the stdout output file file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") endif () endif () @@ -125,8 +125,11 @@ message (STATUS "COMMAND Error: ${TEST_ERROR}") # remove special output file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM) -string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}") -file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") +string (FIND TEST_STREAM "_pmi_alps" "${TEST_FIND_RESULT}") +if ("${TEST_FIND_RESULT}" GREATER "0") + string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}") + file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_STREAM}) +endif () # if the output file needs Storage text removed if (TEST_MASK) |