summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-03-24 13:30:29 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-03-24 13:30:29 (GMT)
commit3c866e69a678bb383fce11c31cb1b1e94eb1e6c1 (patch)
tree49b833a7abc3a187390033282d937fc5b8b036bf
parent76abbdeff03a5025d8786f3fdc4007c5bed64a71 (diff)
downloadhdf5-3c866e69a678bb383fce11c31cb1b1e94eb1e6c1.zip
hdf5-3c866e69a678bb383fce11c31cb1b1e94eb1e6c1.tar.gz
hdf5-3c866e69a678bb383fce11c31cb1b1e94eb1e6c1.tar.bz2
[svn-r20307] The TEST_REFERENCE EOL adjustment block needs to be included in the SKIP_COMPARE IF block
-rw-r--r--config/cmake/runTest.cmake16
1 files changed, 8 insertions, 8 deletions
diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake
index 28f4114..34fac1f 100644
--- a/config/cmake/runTest.cmake
+++ b/config/cmake/runTest.cmake
@@ -14,9 +14,9 @@ ENDIF (NOT TEST_FOLDER)
IF (NOT TEST_OUTPUT)
MESSAGE (FATAL_ERROR "Require TEST_OUTPUT to be defined")
ENDIF (NOT TEST_OUTPUT)
-#IF (NOT TEST_EXPECT)
-# MESSAGE (STATUS "Require TEST_EXPECT to be defined")
-#ENDIF (NOT TEST_EXPECT)
+IF (NOT TEST_EXPECT)
+ MESSAGE (STATUS "Require TEST_EXPECT to be defined")
+ENDIF (NOT TEST_EXPECT)
#IF (NOT TEST_FILTER)
# MESSAGE (STATUS "Require TEST_FILTER to be defined")
#ENDIF (NOT TEST_FILTER)
@@ -91,12 +91,12 @@ IF (TEST_FILTER)
FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
ENDIF (TEST_FILTER)
-IF (WIN32 AND NOT MINGW)
- FILE (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
- FILE (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
-ENDIF (WIN32 AND NOT MINGW)
-
IF (NOT TEST_SKIP_COMPARE)
+ IF (WIN32 AND NOT MINGW)
+ FILE (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+ FILE (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
+ 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}