diff options
| author | Antonin Descampe <antonin@gmail.com> | 2014-10-22 22:52:01 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2014-10-22 22:52:01 +0000 |
| commit | d47f7a249d1ae0ec7e336db22aad98805c748b90 (patch) | |
| tree | 44b5c8a10b999dfd171bd3073eb52d6104906421 /tests | |
| parent | 7280263988243a2b054addd267bb6b1a2ba9e6cc (diff) | |
[trunk] workaround to make MD5 work under valgrind on MacOSX (fixes issue 410)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/nonregression/checkmd5refs.cmake | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/tests/nonregression/checkmd5refs.cmake b/tests/nonregression/checkmd5refs.cmake index d6198af0..bbc7ac32 100644 --- a/tests/nonregression/checkmd5refs.cmake +++ b/tests/nonregression/checkmd5refs.cmake @@ -41,22 +41,12 @@ endif() file(READ ${REFFILE} variable) foreach(pgxfullpath ${globfiles}) + file(MD5 ${pgxfullpath} output) get_filename_component(pgxfile ${pgxfullpath} NAME) - execute_process( - COMMAND ${CMAKE_COMMAND} -E md5sum ${pgxfile} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Temporary - RESULT_VARIABLE res - OUTPUT_VARIABLE output - ERROR_VARIABLE error_output - OUTPUT_STRIP_TRAILING_WHITESPACE # important - ) - - # Pass the output back to ctest - if(res) - message(SEND_ERROR "md5 could not be computed, it failed with value ${res}. Output was: ${error_output}") - endif() string(REGEX MATCH "[0-9a-f]+ ${pgxfile}" output_var "${variable}") + + set(output "${output} ${pgxfile}") if("${output_var}" STREQUAL "${output}") message(STATUS "equal: [${output_var}] vs [${output}]") |