From e41647d781d7d7c7883270ee63f6d1b7506ee722 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 10 Aug 2010 11:13:05 -0500
Subject: [svn-r19214] Test for compare of output text to expected needed to
 account for windows line endings.

Moved ADD_TEST commands to macro.

Tested: local linux, windows
---
 tools/h5dump/CMakeLists.txt | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index 6426986..0038730 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -296,6 +296,22 @@ IF (BUILD_TESTING)
     )
   ENDMACRO (ADD_H5_TEST file)
 
+  MACRO (ADD_H5_EXPORT_TEST resultfile targetfile resultcode)
+    ADD_TEST (
+        NAME H5DUMP-output-${resultfile}
+        COMMAND $<TARGET_FILE:h5dump> -d /Dataset1 -s 0 -R -y -o ${PROJECT_BINARY_DIR}/${resultfile}.txt ${PROJECT_BINARY_DIR}/${targetfile}
+    )
+    IF (WIN32 AND NOT MINGW)
+      FILE (READ ${PROJECT_BINARY_DIR}/${resultfile}.exp TEST_STREAM)
+      FILE (WRITE ${PROJECT_BINARY_DIR}/${resultfile}.exp "${TEST_STREAM}")
+    ENDIF (WIN32 AND NOT MINGW)
+    ADD_TEST (
+        NAME H5DUMP-output-cmp-${resultfile}
+        COMMAND ${CMAKE_COMMAND}
+              -E compare_files ${PROJECT_BINARY_DIR}/${resultfile}.txt ${PROJECT_BINARY_DIR}/${resultfile}.exp
+    )
+  ENDMACRO (ADD_H5_EXPORT_TEST file)
+
   # Determine which filters are available
   SET (USE_FILTER_SZIP H5_HAVE_FILTER_SZIP)
   SET (USE_FILTER_DEFLATE H5_HAVE_FILTER_DEFLATE)
@@ -590,15 +606,7 @@ IF (BUILD_TESTING)
   ADD_H5_TEST (tdataregR 0 -R tdatareg.h5)
   ADD_H5_TEST (tattrreg 0 tattrreg.h5)
   ADD_H5_TEST (tattrregR 0 -R tattrreg.h5)
-
-  ADD_TEST (
-      NAME H5DUMP-output-tdatreg
-      COMMAND $<TARGET_FILE:h5dump> -d /Dataset1 -s 0 -R -y -o ${PROJECT_BINARY_DIR}/tbinregR.txt ${PROJECT_BINARY_DIR}/tdatareg.h5)
-
-  ADD_TEST (
-      NAME H5DUMP-output-cmp-tdatreg
-      COMMAND ${CMAKE_COMMAND}
-            -E compare_files ${PROJECT_BINARY_DIR}/tbinregR.txt ${PROJECT_BINARY_DIR}/tbinregR.exp)
+  ADD_H5_EXPORT_TEST (tbinregR tdatareg.h5 0 -d /Dataset1 -s 0 -R -y -o)
 
   # tests for group creation order
   # "1" tracked, "2" name, root tracked
-- 
cgit v0.12