diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-12-31 20:07:57 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-12-31 20:07:57 (GMT) |
| commit | fa6077332b36f3af0042561ccff29faef7f09e34 (patch) | |
| tree | 615170bc289e63ab2170c11201abf7487d1a8e7e | |
| parent | b30a1fe44aa804a67f2291005bf8135ac5c2dc99 (diff) | |
| parent | 0e6cf18b06d71dc8da9307dddce5e1833f197e19 (diff) | |
| download | hdf5-fa6077332b36f3af0042561ccff29faef7f09e34.zip hdf5-fa6077332b36f3af0042561ccff29faef7f09e34.tar.gz hdf5-fa6077332b36f3af0042561ccff29faef7f09e34.tar.bz2 | |
Merge pull request #1416 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '0e6cf18b06d71dc8da9307dddce5e1833f197e19':
Fix runtest case for data to stdout in tool
| -rw-r--r-- | config/cmake_ext_mod/runTest.cmake | 11 | ||||
| -rw-r--r-- | tools/test/h5jam/tellub.c | 4 |
2 files changed, 9 insertions, 6 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) diff --git a/tools/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c index aa779b3..559c677 100644 --- a/tools/test/h5jam/tellub.c +++ b/tools/test/h5jam/tellub.c @@ -53,7 +53,7 @@ usage (const char *prog) /*------------------------------------------------------------------------- * Function: parse_command_line * - * Purpose: Parse the command line for the h5dumper. + * Purpose: Parse the command line. * * Return: Success: void * Failure: Exits program with EXIT_FAILURE value. @@ -89,7 +89,7 @@ parse_command_line (int argc, const char *argv[]) /*------------------------------------------------------------------------- * Function: main * - * Purpose: HDF5 user block unjammer + * Purpose: HDF5 user block tell size * * Return: EXIT_SUCCESS/EXIT_FAILURE *------------------------------------------------------------------------- |