[svn-r24824] HDFFV-8700 -

KitWare recommendations: Change CMake commands to lower case.
Bump up CMake minimum versions.
Split test file into separate file for h5repack test.

Tested: local linux

1 files changed, 21 insertions, 21 deletions

diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake
index 9a891e6..879426c 100644
--- a/config/cmake/runTest.cmake
+++ b/config/cmake/runTest.cmake
@@ -49,12 +49,12 @@ EXECUTE_PROCESS (
 message (STATUS "COMMAND Result: ${TEST_RESULT}")
 
 if (ERROR_APPEND)
-  FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
-  FILE (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") 
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
+  file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") 
 endif (ERROR_APPEND)
 
 if (TEST_APPEND)
-  FILE (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_APPEND} ${TEST_RESULT}\n") 
+  file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_APPEND} ${TEST_RESULT}\n") 
 endif (TEST_APPEND)
 
 # if the return value is !=${TEST_EXPECT} bail out
@@ -65,22 +65,22 @@ endif (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
 message (STATUS "COMMAND Error: ${TEST_ERROR}")
 
 if (TEST_MASK)
-  FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
   STRING(REGEX REPLACE "Storage:[^\n]+\n" "Storage:   <details removed for portability>\n" TEST_STREAM "${TEST_STREAM}") 
-  FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
 endif (TEST_MASK)
 
 if (TEST_MASK_MOD)
-  FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
   STRING(REGEX REPLACE "Modified:[^\n]+\n" "Modified:  XXXX-XX-XX XX:XX:XX XXX\n" TEST_STREAM "${TEST_STREAM}") 
-  FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
 endif (TEST_MASK_MOD)
 
 if (TEST_MASK_ERROR)
   if (NOT TEST_ERRREF)
-    FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+    file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
   else (NOT TEST_ERRREF)
-    FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
+    file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
   endif (NOT TEST_ERRREF)
   STRING(REGEX REPLACE "thread [0-9]*:" "thread (IDs):" TEST_STREAM "${TEST_STREAM}") 
   STRING(REGEX REPLACE ": ([^\n]*)[.]c " ": (file name) " TEST_STREAM "${TEST_STREAM}") 
@@ -90,22 +90,22 @@ if (TEST_MASK_ERROR)
   STRING(REGEX REPLACE "H5Eget_auto[1-2]*" "H5Eget_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}") 
   STRING(REGEX REPLACE "H5Eset_auto[1-2]*" "H5Eset_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}") 
   if (NOT TEST_ERRREF)
-    FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
   else (NOT TEST_ERRREF)
-    FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
+    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
   endif (NOT TEST_ERRREF)
 endif (TEST_MASK_ERROR)
 
 if (TEST_FILTER)
-  FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
   STRING(REGEX REPLACE "${TEST_FILTER}" "" TEST_STREAM "${TEST_STREAM}") 
-  FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
 endif (TEST_FILTER)
 
 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}")
+    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
@@ -115,9 +115,9 @@ if (NOT TEST_SKIP_COMPARE)
   )
   if (NOT ${TEST_RESULT} STREQUAL 0)
   set (TEST_RESULT 0)
-  FILE (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
+  file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
   LIST (LENGTH test_act len_act)
-  FILE (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
+  file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
   LIST (LENGTH test_ref len_ref)
   if (NOT ${len_act} STREQUAL "0")
     MATH (EXPR _FP_LEN "${len_ref} - 1")
@@ -146,8 +146,8 @@ if (NOT TEST_SKIP_COMPARE)
   
   if (TEST_ERRREF)
     if (WIN32 AND NOT MINGW)
-      FILE (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
-      FILE (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
+      file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
+      file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
     endif (WIN32 AND NOT MINGW)
 
     # now compare the error output with the error reference
@@ -157,9 +157,9 @@ if (NOT TEST_SKIP_COMPARE)
     )
     if (NOT ${TEST_RESULT} STREQUAL 0)
     set (TEST_RESULT 0)
-    FILE (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT}.err test_act)
+    file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT}.err test_act)
     LIST (LENGTH test_act len_act)
-    FILE (STRINGS ${TEST_FOLDER}/${TEST_ERRREF} test_ref)
+    file (STRINGS ${TEST_FOLDER}/${TEST_ERRREF} test_ref)
     LIST (LENGTH test_ref len_ref)
     MATH (EXPR _FP_LEN "${len_ref} - 1")
     if (NOT ${len_act} STREQUAL "0")