Merge pull request #913 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit '5a8ac1fb6c13e776bc17fa52c4cdf353c907907b':
  Fix test loop
  Correct if-endif block
  Remove option from list in doc
  Remove t_cache_image test on Windows
  Correct use of LIST var

4 files changed, 46 insertions, 43 deletions

diff --git a/java/src/jni/h5dImp.c b/java/src/jni/h5dImp.c
index 66efed0..9784055 100644
--- a/java/src/jni/h5dImp.c
+++ b/java/src/jni/h5dImp.c
@@ -1019,7 +1019,7 @@ Java_hdf_hdf5lib_H5_H5DreadVL
     } /* end else */
 
     return (jint)status;
-} /* end Java_hdf_hdf5lib_H5_H5Dread_1VLStrings */
+} /* end Java_hdf_hdf5lib_H5_H5Dread_1VL */
 
 herr_t
 H5DreadVL_asstr
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 99efb6a..f54ca4b 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -571,7 +571,6 @@ HDF5_ENABLE_DEPRECATED_SYMBOLS "Enable deprecated public API symbols"
 HDF5_ENABLE_DIRECT_VFD         "Build the Direct I/O Virtual File Driver"                     OFF
 HDF5_ENABLE_EMBEDDED_LIBINFO   "embed library info into executables"                          ON
 HDF5_ENABLE_HSIZET             "Enable datasets larger than memory"                           ON
-HDF5_ENABLE_LARGE_FILE         "Enable support for large (64-bit) files on Linux."            ON
 HDF5_ENABLE_PARALLEL           "Enable parallel build (requires MPI)"                         OFF
 HDF5_ENABLE_TRACE              "Enable API tracing capability"                                OFF
 HDF5_ENABLE_USING_MEMCHECKER   "Indicate that a memory checker is used"                       OFF
diff --git a/test/CMakeVFDTests.cmake b/test/CMakeVFDTests.cmake
index 944b163..995f4e0 100644
--- a/test/CMakeVFDTests.cmake
+++ b/test/CMakeVFDTests.cmake
@@ -88,7 +88,7 @@ endif ()
       links_env
   )
   if (NOT CYGWIN)
-    list(REMOVE_ITEM ${H5_VFD_SKIP_TESTS} big cache)
+    list (REMOVE_ITEM H5_VFD_SKIP_TESTS big cache)
   endif ()
 
   # Windows only macro
@@ -243,56 +243,56 @@ endif ()
         else ()
           DO_VFD_TEST (${test} ${vfdname} ${resultcode})
         endif ()
-      endforeach ()
-      set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES DEPENDS VFD-${vfdname}-flush1)
-      set_tests_properties (VFD-${vfdname}-flush1 PROPERTIES TIMEOUT 10)
-      set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES TIMEOUT 10)
-      set_tests_properties (VFD-${vfdname}-istore PROPERTIES TIMEOUT 1800)
-      if (NOT CYGWIN)
-        set_tests_properties (VFD-${vfdname}-cache PROPERTIES TIMEOUT 1800)
       endif ()
-      if (BUILD_SHARED_LIBS)
-        set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES DEPENDS VFD-${vfdname}-flush1-shared)
-        set_tests_properties (VFD-${vfdname}-flush1-shared PROPERTIES TIMEOUT 10)
-        set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES TIMEOUT 10)
-        set_tests_properties (VFD-${vfdname}-istore-shared PROPERTIES TIMEOUT 1800)
-        if (NOT CYGWIN AND NOT WIN32)
-          set_tests_properties (VFD-${vfdname}-cache-shared PROPERTIES TIMEOUT 1800)
-        endif ()
+    endforeach ()
+    set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES DEPENDS VFD-${vfdname}-flush1)
+    set_tests_properties (VFD-${vfdname}-flush1 PROPERTIES TIMEOUT 10)
+    set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES TIMEOUT 10)
+    set_tests_properties (VFD-${vfdname}-istore PROPERTIES TIMEOUT 1800)
+    if (NOT CYGWIN)
+      set_tests_properties (VFD-${vfdname}-cache PROPERTIES TIMEOUT 1800)
+    endif ()
+    if (BUILD_SHARED_LIBS)
+      set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES DEPENDS VFD-${vfdname}-flush1-shared)
+      set_tests_properties (VFD-${vfdname}-flush1-shared PROPERTIES TIMEOUT 10)
+      set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES TIMEOUT 10)
+      set_tests_properties (VFD-${vfdname}-istore-shared PROPERTIES TIMEOUT 1800)
+      if (NOT CYGWIN AND NOT WIN32)
+        set_tests_properties (VFD-${vfdname}-cache-shared PROPERTIES TIMEOUT 1800)
       endif ()
-      if (HDF5_TEST_FHEAP_VFD)
-        add_test (NAME VFD-${vfdname}-fheap
+    endif ()
+    if (HDF5_TEST_FHEAP_VFD)
+      add_test (NAME VFD-${vfdname}-fheap
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:fheap>"
+              -D "TEST_ARGS:STRING="
+              -D "TEST_VFD:STRING=${vfdname}"
+              -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_OUTPUT=${vfdname}-fheap"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/${vfdname}"
+              -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
+      )
+      set_tests_properties (VFD-${vfdname}-fheap PROPERTIES
+          TIMEOUT 1800
+          ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname};HDF5TestExpress=${HDF_TEST_EXPRESS}"
+          WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}
+      )
+      if (BUILD_SHARED_LIBS)
+        add_test (NAME VFD-${vfdname}-fheap-shared
             COMMAND "${CMAKE_COMMAND}"
-                -D "TEST_PROGRAM=$<TARGET_FILE:fheap>"
+                -D "TEST_PROGRAM=$<TARGET_FILE:fheap-shared>"
                 -D "TEST_ARGS:STRING="
                 -D "TEST_VFD:STRING=${vfdname}"
                 -D "TEST_EXPECT=${resultcode}"
-                -D "TEST_OUTPUT=${vfdname}-fheap"
-                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/${vfdname}"
+                -D "TEST_OUTPUT=${vfdname}-fheap-shared"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/${vfdname}-shared"
                 -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
         )
-        set_tests_properties (VFD-${vfdname}-fheap PROPERTIES
+        set_tests_properties (VFD-${vfdname}-fheap-shared PROPERTIES
             TIMEOUT 1800
-            ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname};HDF5TestExpress=${HDF_TEST_EXPRESS}"
-            WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}
+            ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname}-shared;HDF5TestExpress=${HDF_TEST_EXPRESS}"
+            WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}-shared
         )
-        if (BUILD_SHARED_LIBS)
-          add_test (NAME VFD-${vfdname}-fheap-shared
-              COMMAND "${CMAKE_COMMAND}"
-                  -D "TEST_PROGRAM=$<TARGET_FILE:fheap-shared>"
-                  -D "TEST_ARGS:STRING="
-                  -D "TEST_VFD:STRING=${vfdname}"
-                  -D "TEST_EXPECT=${resultcode}"
-                  -D "TEST_OUTPUT=${vfdname}-fheap-shared"
-                  -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/${vfdname}-shared"
-                  -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
-          )
-          set_tests_properties (VFD-${vfdname}-fheap-shared PROPERTIES
-              TIMEOUT 1800
-              ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname}-shared;HDF5TestExpress=${HDF_TEST_EXPRESS}"
-              WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}-shared
-          )
-        endif ()
       endif ()
     endif ()
   endmacro ()
diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake
index 87470f3..cd9acda 100644
--- a/testpar/CMakeTests.cmake
+++ b/testpar/CMakeTests.cmake
@@ -18,6 +18,10 @@
 
 add_test (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS})
 
+if (WIN32)
+  # t_cache_imagee uses fork() and execve(), will not run on Windows
+  list (REMOVE_ITEM H5P_TESTS t_cache_image)
+endif ()
 foreach (testp ${H5P_TESTS})
   add_test (NAME TEST_PAR_${testp} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:${testp}> ${MPIEXEC_POSTFLAGS})
 endforeach ()