summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-11-28 21:37:37 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-11-28 21:37:37 (GMT)
commitc7440f2f366809e9a51d260327fcdef78427bd0a (patch)
treee2742c1fb4da4ec461db1bfb7983a0a4f86ec93c /config
parentb3c12e8d5542de76415e1f296bef6f3dbda292d0 (diff)
downloadhdf5-c7440f2f366809e9a51d260327fcdef78427bd0a.zip
hdf5-c7440f2f366809e9a51d260327fcdef78427bd0a.tar.gz
hdf5-c7440f2f366809e9a51d260327fcdef78427bd0a.tar.bz2
[svn-r23064] HDFFV-8202: Add diff display to cmake output on error. Merged changes from runTest.cmake.
Diffstat (limited to 'config')
-rw-r--r--config/cmake/prunTest.cmake24
1 files changed, 19 insertions, 5 deletions
diff --git a/config/cmake/prunTest.cmake b/config/cmake/prunTest.cmake
index 8bcf729..261f8a4 100644
--- a/config/cmake/prunTest.cmake
+++ b/config/cmake/prunTest.cmake
@@ -103,16 +103,30 @@ IF (NOT TEST_SKIP_COMPARE)
ENDIF (WIN32 AND NOT MINGW)
# now compare the output with the reference
- EXECUTE_PROCESS (
- COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/P_${TEST_REFERENCE}
- RESULT_VARIABLE TEST_RESULT
- )
+ SET (TEST_RESULT 0)
+ FILE (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
+ LIST (LENGTH "${test_act}" len_act)
+ FILE (STRINGS ${TEST_FOLDER}/P_${TEST_REFERENCE} test_ref)
+ LIST (LENGTH "${test_ref}" len_ref)
+ MATH (EXPR _FP_LEN "${len_ref} - 1")
+ FOREACH (line RANGE 0 ${_FP_LEN})
+ LIST (GET "${test_act}" ${line} str_act)
+ LIST (GET "${test_ref}" ${line} str_ref)
+ STRING (COMPARE NOTEQUAL ${str_act} ${str_ref} str_res)
+ IF (${str_res})
+ SET (TEST_RESULT 1)
+ MESSAGE ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}")
+ ENDIF (${str_res})
+ ENDFOREACH (line RANGE 0 ${_FP_LEN})
+ IF (NOT ${len_act} STREQUAL ${len_ref})
+ SET (TEST_RESULT 1)
+ ENDIF (NOT ${len_act} STREQUAL ${len_ref})
MESSAGE (STATUS "COMPARE Result: ${TEST_RESULT}")
# again, if return value is !=0 scream and shout
IF (NOT ${TEST_RESULT} STREQUAL 0)
- MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not match P_${TEST_REFERENCE}")
+ MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match P_${TEST_REFERENCE}")
ENDIF (NOT ${TEST_RESULT} STREQUAL 0)
ENDIF (NOT TEST_SKIP_COMPARE)