Merge pull request #1220 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:1.10/master to 1.10/master

* commit '21eef8a98ee6949c69d79c6c4d87fc8e4e38dc29': (354 commits)
  Commit version with new release date.
  Add example packaging option and fix html5 issues
  Commit version with new release date.
  Commit files changed by autogen.sh.
  Merge pull request #1208 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
  Merge pull request #1207 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
  Merge pull request #1203 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
  Commit version with new release date. Commit new generated H5version.h including #defines for H5_USE_110_API.
  Correct nested c-style comment.
  Merge pull request #1197 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:hdf5_1_10 to hdf5_1_10
  Merge pull request #1194 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
  Updated the H5Dread/write_chunk() release note.
  Added a release note for the H5Dread/write_chunk() API calls.
  Update Intel Fortran version for Windows 10.
  RELEASE.txt updates. Version change for 1.10.3 release.
  Revised entry on CVE issues
  Added notes about CVE issues
  Update version for HDF5 1.10.3 release.
  Add placeholder for performance improvement in RELEASE.txt
  updated fortran fixes
  ...

3 files changed, 26 insertions, 31 deletions

diff --git a/tools/test/h5jam/CMakeLists.txt b/tools/test/h5jam/CMakeLists.txt
index b623860..cc70adc 100644
--- a/tools/test/h5jam/CMakeLists.txt
+++ b/tools/test/h5jam/CMakeLists.txt
@@ -1,31 +1,29 @@
 cmake_minimum_required (VERSION 3.10)
-PROJECT (HDF5_TOOLS_TEST_H5JAM)
+project (HDF5_TOOLS_TEST_H5JAM C)
 
-#-----------------------------------------------------------------------------
-# Setup include Directories
-#-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
+# --------------------------------------------------------------------
+# Add the h5jam test executables
+# --------------------------------------------------------------------
+if (HDF5_BUILD_GENERATORS)
+  add_executable (h5jamgentest ${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/h5jamgentest.c)
+  target_include_directories(h5jamgentest PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5jamgentest STATIC)
+  target_link_libraries (h5jamgentest PRIVATE ${HDF5_LIB_TARGET})
+  set_target_properties (h5jamgentest PROPERTIES FOLDER generator/tools)
 
-  # --------------------------------------------------------------------
-  # Add the h5jam test executables
-  # --------------------------------------------------------------------
-  if (HDF5_BUILD_GENERATORS)
-    add_executable (h5jamgentest ${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/h5jamgentest.c)
-    TARGET_C_PROPERTIES (testhdf5 STATIC " " " ")
-    target_link_libraries (h5jamgentest ${HDF5_LIB_TARGET})
-    set_target_properties (h5jamgentest PROPERTIES FOLDER generator/tools)
-
-    #add_test (NAME h5jamgentest COMMAND $<TARGET_FILE:h5jamgentest>)
-  endif ()
+  #add_test (NAME h5jamgentest COMMAND $<TARGET_FILE:h5jamgentest>)
+endif ()
 
 add_executable (getub ${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/getub.c)
-TARGET_C_PROPERTIES (getub STATIC " " " ")
-target_link_libraries (getub  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+target_include_directories(getub PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+TARGET_C_PROPERTIES (getub STATIC)
+target_link_libraries (getub PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (getub PROPERTIES FOLDER tools)
 
 add_executable (tellub ${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/tellub.c)
-TARGET_C_PROPERTIES (tellub STATIC " " " ")
-target_link_libraries (tellub  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+target_include_directories(tellub PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+TARGET_C_PROPERTIES (tellub STATIC)
+target_link_libraries (tellub PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (tellub PROPERTIES FOLDER tools)
 
-  include (CMakeTests.cmake)
+include (CMakeTests.cmake)
diff --git a/tools/test/h5jam/Makefile.in b/tools/test/h5jam/Makefile.in
index a5dca35..1163c07 100644
--- a/tools/test/h5jam/Makefile.in
+++ b/tools/test/h5jam/Makefile.in
@@ -540,6 +540,7 @@ JAVA_PATH_NAME = @JAVA_PATH_NAME@
 JAVA_VERSION = @JAVA_VERSION@
 JNIFLAGS = @JNIFLAGS@
 JUNIT = @JUNIT@
+LARGE_PARALLEL_IO = @LARGE_PARALLEL_IO@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -587,6 +588,7 @@ PAC_FORTRAN_NATIVE_REAL_KIND = @PAC_FORTRAN_NATIVE_REAL_KIND@
 PAC_FORTRAN_NATIVE_REAL_SIZEOF = @PAC_FORTRAN_NATIVE_REAL_SIZEOF@
 PAC_FORTRAN_NUM_INTEGER_KINDS = @PAC_FORTRAN_NUM_INTEGER_KINDS@
 PARALLEL = @PARALLEL@
+PARALLEL_FILTERED_WRITES = @PARALLEL_FILTERED_WRITES@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PROFILING = @PROFILING@
 RANLIB = @RANLIB@
diff --git a/tools/test/h5jam/h5jamgentest.c b/tools/test/h5jam/h5jamgentest.c
index 9f3d000..1644440 100644
--- a/tools/test/h5jam/h5jamgentest.c
+++ b/tools/test/h5jam/h5jamgentest.c
@@ -87,7 +87,8 @@ typedef struct s1_t {
 
 /* A UD link traversal function.  Shouldn't actually be called. */
 static hid_t UD_traverse(const char H5_ATTR_UNUSED * link_name, hid_t H5_ATTR_UNUSED cur_group,
-    const void H5_ATTR_UNUSED * udata, size_t H5_ATTR_UNUSED udata_size, hid_t H5_ATTR_UNUSED lapl_id)
+    const void H5_ATTR_UNUSED * udata, size_t H5_ATTR_UNUSED udata_size, hid_t H5_ATTR_UNUSED lapl_id,
+    hid_t H5_ATTR_UNUSED dxpl_id)
 {
     return -1;
 }
@@ -269,10 +270,7 @@ gent_ub(const char * filename, size_t ub_size, size_t ub_fill)
   H5Fclose(fid);
 
   /* If a user block is being used, write to it here */
-  if(ub_size > 0)
-  {
-    ssize_t nbytes;
-
+  if(ub_size > 0) {
     HDassert(ub_size <= BUF_SIZE);
 
     fd = HDopen(filename, O_RDWR);
@@ -284,8 +282,7 @@ gent_ub(const char * filename, size_t ub_size, size_t ub_fill)
     for (u = 0; u < ub_fill; u++)
       *bp++ = pattern[u % 10];
 
-    nbytes = HDwrite(fd, buf, ub_size);
-    HDassert(nbytes >= 0);
+    HDwrite(fd, buf, ub_size);
 
     HDclose(fd);
   }
@@ -298,7 +295,6 @@ create_textfile(const char *name, size_t size)
     int fd;
     size_t i;
     char *bp;
-    ssize_t nbytes;
 
     fd = HDcreat(name,0777);
     HDassert(fd >= 0);
@@ -310,8 +306,7 @@ create_textfile(const char *name, size_t size)
     for(i = 0; i < size; i++)
         *bp++ = pattern[i % 10];
 
-    nbytes = HDwrite(fd, buf, size);
-    HDassert(nbytes >= 0);
+    HDwrite(fd, buf, size);
 
     HDfree(buf);