summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-01-07 20:28:57 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-01-07 20:28:57 (GMT)
commit6e77ce012ffe1ba3f4d14d3fee42f4dfc7a04989 (patch)
treed9d2d6daa06ee2a456b5d859845b895ff2cb69a9
parent6fd9729b82e870ec497270f4c5796c02064c1d0e (diff)
downloadhdf5-6e77ce012ffe1ba3f4d14d3fee42f4dfc7a04989.zip
hdf5-6e77ce012ffe1ba3f4d14d3fee42f4dfc7a04989.tar.gz
hdf5-6e77ce012ffe1ba3f4d14d3fee42f4dfc7a04989.tar.bz2
[svn-r23138] Only do line by line compare if compare files fail.
Tested: local linux
-rw-r--r--config/cmake/runTest.cmake12
1 files changed, 12 insertions, 0 deletions
diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake
index 7735e9b..0a80873 100644
--- a/config/cmake/runTest.cmake
+++ b/config/cmake/runTest.cmake
@@ -109,6 +109,11 @@ 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}/${TEST_REFERENCE}
+ RESULT_VARIABLE TEST_RESULT
+ )
+ IF (NOT ${TEST_RESULT} STREQUAL 0)
SET (TEST_RESULT 0)
FILE (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
LIST (LENGTH test_act len_act)
@@ -130,6 +135,7 @@ IF (NOT TEST_SKIP_COMPARE)
IF (NOT ${len_act} STREQUAL ${len_ref})
SET (TEST_RESULT 1)
ENDIF (NOT ${len_act} STREQUAL ${len_ref})
+ ENDIF (NOT ${TEST_RESULT} STREQUAL 0)
MESSAGE (STATUS "COMPARE Result: ${TEST_RESULT}")
@@ -145,6 +151,11 @@ IF (NOT TEST_SKIP_COMPARE)
ENDIF (WIN32 AND NOT MINGW)
# now compare the error output with the error reference
+ EXECUTE_PROCESS (
+ COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF}
+ RESULT_VARIABLE TEST_RESULT
+ )
+ IF (NOT ${TEST_RESULT} STREQUAL 0)
SET (TEST_RESULT 0)
FILE (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT}.err test_act)
LIST (LENGTH test_act len_act)
@@ -167,6 +178,7 @@ IF (NOT TEST_SKIP_COMPARE)
IF (NOT ${len_act} STREQUAL ${len_ref})
SET (TEST_RESULT 1)
ENDIF (NOT ${len_act} STREQUAL ${len_ref})
+ ENDIF (NOT ${TEST_RESULT} STREQUAL 0)
MESSAGE (STATUS "COMPARE Result: ${TEST_RESULT}")