]> granicus.if.org Git - openjpeg/commitdiff
[trunk] workaround to make MD5 work under valgrind on MacOSX (fixes issue 410)
authorAntonin Descampe <antonin@gmail.com>
Wed, 22 Oct 2014 22:52:01 +0000 (22:52 +0000)
committerAntonin Descampe <antonin@gmail.com>
Wed, 22 Oct 2014 22:52:01 +0000 (22:52 +0000)
tests/nonregression/checkmd5refs.cmake

index d6198af016bc7af41ae1755e44fcc27bf5d75e28..bbc7ac32fd838f16a95dd6fc26ceecf36769cf04 100644 (file)
@@ -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}]")