[svn-r27173]

2 files changed, 29 insertions, 22 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c402324..c25e9cc 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -85,7 +85,7 @@ if (BUILD_SHARED_LIBS)
         TARGET     ${HDF5_TEST_PLUGIN_LIB_TARGET}
         POST_BUILD
         COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different 
+        ARGS       -E copy_if_different
           "$<TARGET_FILE:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
           "${CMAKE_BINARY_DIR}/testdir1/$<TARGET_FILE_NAME:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
     )
@@ -116,7 +116,7 @@ if (BUILD_SHARED_LIBS)
         TARGET     ${HDF5_TEST_PLUGIN_LIB_TARGET}
         POST_BUILD
         COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different 
+        ARGS       -E copy_if_different
           "$<TARGET_FILE:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
           "${CMAKE_BINARY_DIR}/testdir2/$<TARGET_FILE_NAME:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
     )
@@ -281,7 +281,7 @@ set_target_properties (links_env PROPERTIES FOLDER test)
 
 #-- Adding test for libinfo
 set (GREP_RUNNER ${PROJECT_BINARY_DIR}/GrepRunner.cmake)
-file (WRITE ${GREP_RUNNER} 
+file (WRITE ${GREP_RUNNER}
   "file (STRINGS \${TEST_PROGRAM} TEST_RESULT REGEX \"SUMMARY OF THE HDF5 CONFIGURATION\")
 if (\${TEST_RESULT} STREQUAL \"0\")
   message (FATAL_ERROR \"Failed: The output: \${TEST_RESULT} of \${TEST_PROGRAM} did not contain SUMMARY OF THE HDF5 CONFIGURATION\")
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index 5087290..c1f6f37 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -162,7 +162,7 @@ endif (HDF5_TEST_VFD)
 add_test (
     NAME H5TEST-clear-testhdf5-objects
     COMMAND    ${CMAKE_COMMAND}
-        -E remove 
+        -E remove
         coord.h5
         dtypes10.h5
         sys_file1
@@ -217,7 +217,7 @@ else (HDF5_ENABLE_USING_MEMCHECKER)
       WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
   )
 endif (HDF5_ENABLE_USING_MEMCHECKER)
-  
+
 ##############################################################################
 ##############################################################################
 ###           T H E   T E S T S  M A C R O S                               ###
@@ -228,7 +228,7 @@ endif (HDF5_ENABLE_USING_MEMCHECKER)
 add_test (
     NAME H5TEST-clear-objects
     COMMAND    ${CMAKE_COMMAND}
-        -E remove 
+        -E remove
         dt_arith1.h5
         dt_arith2.h5
         dtransform.h5
@@ -293,9 +293,16 @@ add_test (
 )
 
 foreach (test ${H5_TESTS})
-  add_test (NAME H5TEST-${test} COMMAND $<TARGET_FILE:${test}>)
+  if (${test} STREQUAL "big" AND CYGWIN)
+    add_test (
+        NAME H5TEST-${test}
+        COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${test}"
+    )
+  else (${test} STREQUAL "big" AND CYGWIN)
+    add_test (NAME H5TEST-${test} COMMAND $<TARGET_FILE:${test}>)
+  endif (${test} STREQUAL "big" AND CYGWIN)
   set_tests_properties (H5TEST-${test} PROPERTIES
-      DEPENDS H5TEST-clear-objects 
+      DEPENDS H5TEST-clear-objects
       ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST"
       WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
   )
@@ -316,7 +323,7 @@ set_tests_properties (H5TEST-big PROPERTIES TIMEOUT 1800)
 add_test (
     NAME H5TEST-clear-cache-objects
     COMMAND    ${CMAKE_COMMAND}
-        -E remove 
+        -E remove
         cache_test.h5
     WORKING_DIRECTORY
         ${HDF5_TEST_BINARY_DIR}/H5TEST
@@ -332,14 +339,14 @@ set_tests_properties (H5TEST-cache PROPERTIES
 add_test (
     NAME H5TEST-clear-cache_api-objects
     COMMAND    ${CMAKE_COMMAND}
-        -E remove 
+        -E remove
         cache_api_test.h5
     WORKING_DIRECTORY
         ${HDF5_TEST_BINARY_DIR}/H5TEST
 )
 add_test (NAME H5TEST-cache_api COMMAND $<TARGET_FILE:cache_api>)
 set_tests_properties (H5TEST-cache_api PROPERTIES
-    DEPENDS H5TEST-clear-cache_api-objects 
+    DEPENDS H5TEST-clear-cache_api-objects
     ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST"
     WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
 )
@@ -348,7 +355,7 @@ set_tests_properties (H5TEST-cache_api PROPERTIES
 add_test (
     NAME H5TEST-clear-ttsafe-objects
     COMMAND    ${CMAKE_COMMAND}
-        -E remove 
+        -E remove
         ttsafe_error.h5
         ttsafe_dcreate.h5
         ttsafe_cancel.h5
@@ -368,7 +375,7 @@ if (HDF5_ENABLE_DEPRECATED_SYMBOLS)
   add_test (
       NAME H5TEST-clear-err_compat-objects
       COMMAND    ${CMAKE_COMMAND}
-          -E remove 
+          -E remove
           err_compat.txt
           err_compat.txt.err
       WORKING_DIRECTORY
@@ -395,7 +402,7 @@ endif (HDF5_ENABLE_DEPRECATED_SYMBOLS)
 add_test (
     NAME H5TEST-clear-error_test-objects
     COMMAND    ${CMAKE_COMMAND}
-        -E remove 
+        -E remove
         error_test.txt
         error_test.txt.err
     WORKING_DIRECTORY
@@ -411,7 +418,7 @@ add_test (NAME H5TEST-error_test COMMAND "${CMAKE_COMMAND}"
     -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5TEST"
     -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
 )
-set_tests_properties (H5TEST-error_test PROPERTIES 
+set_tests_properties (H5TEST-error_test PROPERTIES
     DEPENDS H5TEST-clear-error_test-objects
     ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5_PLUGIN_PRELOAD=::"
     WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
@@ -423,7 +430,7 @@ add_test (
     COMMAND    ${CMAKE_COMMAND}
         -E remove
         links_env.txt
-        links_env.txt.err 
+        links_env.txt.err
         extlinks_env0.h5
         extlinks_env1.h5
         tmp/extlinks_env1.h5
@@ -548,7 +555,7 @@ if (HDF5_TEST_VFD)
       if (${vfdname} STREQUAL "multi" OR ${vfdname} STREQUAL "split")
         if (NOT BUILD_SHARED_LIBS AND NOT CMAKE_BUILD_TYPE MATCHES Debug)
           add_test (
-              NAME VFD-${vfdname}-${vfdtest} 
+              NAME VFD-${vfdname}-${vfdtest}
               COMMAND "${CMAKE_COMMAND}"
                   -D "TEST_PROGRAM=$<TARGET_FILE:${vfdtest}>"
                   -D "TEST_ARGS:STRING="
@@ -570,7 +577,7 @@ if (HDF5_TEST_VFD)
         endif(NOT BUILD_SHARED_LIBS AND NOT CMAKE_BUILD_TYPE MATCHES Debug)
       else (${vfdname} STREQUAL "multi" OR ${vfdname} STREQUAL "split")
         add_test (
-            NAME VFD-${vfdname}-${vfdtest} 
+            NAME VFD-${vfdname}-${vfdtest}
             COMMAND "${CMAKE_COMMAND}"
                 -D "TEST_PROGRAM=$<TARGET_FILE:${vfdtest}>"
                 -D "TEST_ARGS:STRING="
@@ -587,7 +594,7 @@ if (HDF5_TEST_VFD)
       endif (${vfdname} STREQUAL "multi" OR ${vfdname} STREQUAL "split")
     else (${vfdtest} STREQUAL "flush1" OR ${vfdtest} STREQUAL "flush2")
       add_test (
-          NAME VFD-${vfdname}-${vfdtest} 
+          NAME VFD-${vfdname}-${vfdtest}
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_PROGRAM=$<TARGET_FILE:${vfdtest}>"
               -D "TEST_ARGS:STRING="
@@ -610,7 +617,7 @@ if (HDF5_TEST_VFD)
         CHECK_VFD_TEST (${test} ${vfdname} ${resultcode})
       else (WIN32)
         add_test (
-          NAME VFD-${vfdname}-${test} 
+          NAME VFD-${vfdname}-${test}
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_PROGRAM=$<TARGET_FILE:${test}>"
               -D "TEST_ARGS:STRING="
@@ -634,7 +641,7 @@ if (HDF5_TEST_VFD)
     set_tests_properties (VFD-${vfdname}-istore PROPERTIES TIMEOUT 1200)
     if (HDF5_TEST_FHEAP_VFD)
       add_test (
-        NAME VFD-${vfdname}-fheap 
+        NAME VFD-${vfdname}-fheap
         COMMAND "${CMAKE_COMMAND}"
             -D "TEST_PROGRAM=$<TARGET_FILE:fheap>"
             -D "TEST_ARGS:STRING="
@@ -651,7 +658,7 @@ if (HDF5_TEST_VFD)
       )
     endif (HDF5_TEST_FHEAP_VFD)
   ENDMACRO (ADD_VFD_TEST)
-  
+
   # Run test with different Virtual File Driver
   foreach (vfd ${VFD_LIST})
     ADD_VFD_TEST (${vfd} 0)