summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-07-13 13:58:18 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-07-13 13:58:18 (GMT)
commitf48ae2195a01583710eac3b439d7a862cfba2eef (patch)
tree66c48e2e63cf99c2d5613b7babfe008e6e524aa6
parenta947f3b755367540802f71cda4cda6f4ea87d76c (diff)
downloadhdf5-f48ae2195a01583710eac3b439d7a862cfba2eef.zip
hdf5-f48ae2195a01583710eac3b439d7a862cfba2eef.tar.gz
hdf5-f48ae2195a01583710eac3b439d7a862cfba2eef.tar.bz2
[svn-r22569] On windows read/write error reference file just like reference file before comparision. This will set the line endings.
-rw-r--r--config/cmake/runTest.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake
index 40a72f1..d0cc335 100644
--- a/config/cmake/runTest.cmake
+++ b/config/cmake/runTest.cmake
@@ -121,6 +121,11 @@ IF (NOT TEST_SKIP_COMPARE)
ENDIF (NOT ${TEST_RESULT} STREQUAL 0)
IF (TEST_ERRREF)
+ IF (WIN32 AND NOT MINGW)
+ FILE (READ ${TEST_FOLDER}/${TEST_REFERENCE}.err TEST_STREAM)
+ FILE (WRITE ${TEST_FOLDER}/${TEST_REFERENCE}.err "${TEST_STREAM}")
+ 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}