[svn-r24948] Group tests by Common name

Remove WIN32 AND NOT CYGWIN if blocks - should be just WIN32

Tested: local linux CMake

2 files changed, 23 insertions, 23 deletions

diff --git a/c++/examples/CMakeTests.cmake b/c++/examples/CMakeTests.cmake
index 352b799..4db8c68 100644
--- a/c++/examples/CMakeTests.cmake
+++ b/c++/examples/CMakeTests.cmake
@@ -6,7 +6,7 @@
 ##############################################################################
   # Remove any output file left over from previous test run
   add_test (
-      NAME cpp_ex-clear-objects
+      NAME CPP_ex-clear-objects
       COMMAND    ${CMAKE_COMMAND}
           -E remove 
           Group.h5
@@ -16,23 +16,23 @@
           Select.h5
   )
   if (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (cpp_ex-clear-objects PROPERTIES DEPENDS ${last_test})
+    set_tests_properties (CPP_ex-clear-objects PROPERTIES DEPENDS ${last_test})
   endif (NOT "${last_test}" STREQUAL "")
-  set (last_test "cpp_ex-clear-objects")
+  set (last_test "CPP_ex-clear-objects")
 
   foreach (example ${examples})
-    add_test (NAME cpp_ex_${example} COMMAND $<TARGET_FILE:cpp_ex_${example}>)
+    add_test (NAME CPP_ex_${example} COMMAND $<TARGET_FILE:cpp_ex_${example}>)
     if (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (cpp_ex_${example} PROPERTIES DEPENDS ${last_test})
+      set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
     endif (NOT "${last_test}" STREQUAL "")
-    set (last_test "cpp_ex_${example}")
+    set (last_test "CPP_ex_${example}")
   endforeach (example ${examples})
 #the following dependicies are handled by the order of the files
-#  SET_TESTS_PROPERTIES(cpp_ex_readdata PROPERTIES DEPENDS cpp_ex_create)
-#  SET_TESTS_PROPERTIES(cpp_ex_chunks PROPERTIES DEPENDS cpp_ex_extend_ds)
+#  SET_TESTS_PROPERTIES(CPP_ex_readdata PROPERTIES DEPENDS CPP_ex_create)
+#  SET_TESTS_PROPERTIES(CPP_ex_chunks PROPERTIES DEPENDS CPP_ex_extend_ds)
 
   add_test (
-      NAME cpp_ex_tutr-clear-objects
+      NAME CPP_ex_tutr-clear-objects
       COMMAND    ${CMAKE_COMMAND}
           -E remove 
           h5tutr_cmprss.h5
@@ -43,19 +43,19 @@
           h5tutr_subset.h5
   )
   if (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (cpp_ex_tutr-clear-objects PROPERTIES DEPENDS ${last_test})
+    set_tests_properties (CPP_ex_tutr-clear-objects PROPERTIES DEPENDS ${last_test})
   endif (NOT "${last_test}" STREQUAL "")
-  set (last_test "cpp_ex_tutr-clear-objects")
+  set (last_test "CPP_ex_tutr-clear-objects")
   
   foreach (example ${tutr_examples})
-    add_test (NAME cpp_ex_${example} COMMAND $<TARGET_FILE:cpp_ex_${example}>)
+    add_test (NAME CPP_ex_${example} COMMAND $<TARGET_FILE:cpp_ex_${example}>)
     if (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (cpp_ex_${example} PROPERTIES DEPENDS ${last_test})
+      set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
     endif (NOT "${last_test}" STREQUAL "")
-    set (last_test "cpp_ex_${example}")
+    set (last_test "CPP_ex_${example}")
   endforeach (example ${tutr_examples})
 #the following dependicies are handled by the order of the files
-#  SET_TESTS_PROPERTIES(cpp_ex_h5tutr_crtatt PROPERTIES DEPENDS cpp_ex_h5tutr_crtdat)
-#  SET_TESTS_PROPERTIES(cpp_ex_h5tutr_rdwt PROPERTIES DEPENDS cpp_ex_h5tutr_crtdat)
-#  SET_TESTS_PROPERTIES(cpp_ex_h5tutr_crtgrpd PROPERTIES DEPENDS cpp_ex_h5tutr_crtgrpar)
+#  SET_TESTS_PROPERTIES(CPP_ex_h5tutr_crtatt PROPERTIES DEPENDS CPP_ex_h5tutr_crtdat)
+#  SET_TESTS_PROPERTIES(CPP_ex_h5tutr_rdwt PROPERTIES DEPENDS CPP_ex_h5tutr_crtdat)
+#  SET_TESTS_PROPERTIES(CPP_ex_h5tutr_crtgrpd PROPERTIES DEPENDS CPP_ex_h5tutr_crtgrpar)
   
\ No newline at end of file
diff --git a/c++/test/CMakeTests.cmake b/c++/test/CMakeTests.cmake
index 2b05fea..147972f 100644
--- a/c++/test/CMakeTests.cmake
+++ b/c++/test/CMakeTests.cmake
@@ -6,7 +6,7 @@
 ##############################################################################
 # Remove any output file left over from previous test run
 add_test (
-    NAME cpp_testhdf5-clear-objects
+    NAME CPP_testhdf5-clear-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove 
             tattr_basic.h5
@@ -17,8 +17,8 @@ add_test (
             tfattrs.h5
 )
 
-add_test (NAME cpp_testhdf5 COMMAND $<TARGET_FILE:cpp_testhdf5>)
-set_tests_properties (cpp_testhdf5 PROPERTIES DEPENDS cpp_testhdf5-clear-objects)
+add_test (NAME CPP_testhdf5 COMMAND $<TARGET_FILE:cpp_testhdf5>)
+set_tests_properties (CPP_testhdf5 PROPERTIES DEPENDS CPP_testhdf5-clear-objects)
 
 if (HDF5_TEST_VFD)
 
@@ -38,7 +38,7 @@ if (HDF5_TEST_VFD)
   MACRO (ADD_VFD_TEST vfdname resultcode)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
-          NAME VFD-${vfdname}-cpp_testhdf5-clear-objects
+          NAME CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects
           COMMAND    ${CMAKE_COMMAND}
               -E remove 
                   tattr_basic.h5
@@ -49,7 +49,7 @@ if (HDF5_TEST_VFD)
                   tfattrs.h5
       )
       add_test (
-        NAME VFD-${vfdname}-cpp_testhdf5 
+        NAME CPP_VFD-${vfdname}-cpp_testhdf5 
         COMMAND "${CMAKE_COMMAND}"
             -D "TEST_PROGRAM=$<TARGET_FILE:cpp_testhdf5>"
             -D "TEST_ARGS:STRING="
@@ -59,7 +59,7 @@ if (HDF5_TEST_VFD)
             -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
             -P "${HDF5_RESOURCES_DIR}/vfdTest.cmake"
       )
-      set_tests_properties (VFD-${vfdname}-cpp_testhdf5 PROPERTIES DEPENDS VFD-${vfdname}-cpp_testhdf5-clear-objects)
+      set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES DEPENDS CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects)
     endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
   ENDMACRO (ADD_VFD_TEST)