Merge pull request #1590 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:1.10/master to 1.10/masterhdf5-1_10_5

* commit '6819c11508b0610f222fe3bfe8a19f637bf4319c': (154 commits)
  CMake needs a tar.gz examples file for windows, too.
  Correct file permissions on README.txt.
  Address merge anomalies and incorrect file permissions.
  Update release date in README.txt and RELEASE.txt.
  Revisions to Platforms tested.
  Updated LT_VERS_AGE in config/lt_vers.am due to reinstatement of previously removed symbols, then ran autogen.sh to propagate so number changes and H5E_LOGFAIL_g addition to files checked in on release branch.
  Updated H5err.txt to replace a global variable that was removed during the metadata cache logging changes (to maintain binary compatibility).
  HDFFV-10552,10686 restore H5O_*1 functions
  Minor fix in h5str_sprintf for NULL region references
  Add new files to MANIFEST.
  Update so version numbers. fix 2 typos.
  Update RELEASE.txt for TRILABS-34 and remove unused sections.
  Add script for building HDF5 with CMake on HPC machines that use sbatch. Add README file for inclusion in CMake-hdf5-<version>.tar.gz file. Add updated README_HPC file with cross compile instructions.
  set version to 1.10.5-pre1. Change default build mode to production.
  Merge pull request #1560 in HDFFV/hdf5 from hdf5-1-10-documentation-only to hdf5_1_10_5
  Update HISTORY-1_10.txt and RELEASE.txt files.
  Modify RELEASE.txt in response to PR comments
  Check in files generated by autogen.sh for hdf5_1_10_5 release branch.
  Check in files generated by autogen.sh for hdf5_1_10_5 release branch. 2019/02/16.
  Code improvement
  ...

11 files changed, 314 insertions, 197 deletions

diff --git a/tools/test/h5format_convert/CMakeTests.cmake b/tools/test/h5format_convert/CMakeTests.cmake
index 2240813..5792d40 100644
--- a/tools/test/h5format_convert/CMakeTests.cmake
+++ b/tools/test/h5format_convert/CMakeTests.cmake
@@ -22,10 +22,8 @@
   set (HDF5_REFERENCE_FILES
       h5fc_help.ddl
       h5fc_nooption.ddl
-      h5fc_nonexistfile.ddl
       h5fc_d_file.ddl
       h5fc_dname.ddl
-      h5fc_nonexistdset_file.ddl
       h5fc_v_non_chunked.ddl
       h5fc_v_bt1.ddl
       h5fc_v_ndata_bt1.ddl
@@ -49,6 +47,12 @@
       h5fc_v_err.ddl
       h5fc_v_err.ddl.err
   )
+  set (HDF5_REFERENCE_ERR_FILES
+      h5fc_d_file.ddl.err
+      h5fc_dname.err
+      h5fc_nonexistfile.ddl.err
+      h5fc_nonexistdset_file.ddl.err
+  )
   set (HDF5_REFERENCE_TEST_FILES
       h5fc_non_v3.h5
       h5fc_edge_v3.h5
@@ -78,6 +82,10 @@
     HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${ddl_file}" "${PROJECT_BINARY_DIR}/testfiles/${ddl_file}" "h5fc_files")
   endforeach ()
 
+  foreach (h5_file ${HDF5_REFERENCE_ERR_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
+  endforeach ()
+
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
     HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
   endforeach ()
@@ -119,6 +127,7 @@
                   -D "TEST_OUTPUT=${testname}.out"
                   -D "TEST_EXPECT=${resultcode}"
                   -D "TEST_REFERENCE=${resultfile}"
+                  -D "TEST_ERRREF=${resultfile}.err"
                   -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
           )
           set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES DEPENDS "H5FC-${testname}-${testfile}-tmpfile")
@@ -141,6 +150,42 @@
     endif ()
   endmacro ()
 
+  macro (ADD_H5_NOERR_OUTPUT testname resultfile resultcode testfile)
+    # If using memchecker add tests without using scripts
+    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (
+          NAME H5FC-${testname}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              ./testfiles/outtmp.h5
+              ./testfiles/${testname}.out
+              ./testfiles/${testname}.out.err
+      )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5FC-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
+      endif ()
+      add_test (
+          NAME H5FC-${testname}-${testfile}-tmpfile
+          COMMAND    ${CMAKE_COMMAND}
+              -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/outtmp.h5
+      )
+      set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES DEPENDS "H5FC-${testname}-clear-objects")
+      add_test (
+          NAME H5FC-${testname}-${testfile}
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert>"
+              -D "TEST_ARGS=${ARGN};outtmp.h5"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+              -D "TEST_OUTPUT=${testname}.out"
+              -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_REFERENCE=${resultfile}"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES DEPENDS "H5FC-${testname}-${testfile}-tmpfile")
+      set (last_test "H5FC-${testname}-${testfile}")
+    endif ()
+  endmacro ()
+
   macro (ADD_H5_MASK_OUTPUT testname resultfile resultcode testfile)
     # If using memchecker add tests without using scripts
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
@@ -433,17 +478,17 @@
 # h5format_convert -d /GROUP/DSET_BT2 --verbose old_h5fc_ext_none.h5 (verbose, bt1 dataset)
 # h5format_convert -d /DSET_NDATA_BT2 -v -n old_h5fc_ext_none.h5 (verbose, noop, bt1+nodata dataset)
 # h5format_convert -v old_h5fc_ext_none.h5 (verbose, all datasets)
-  ADD_H5_OUTPUT (h5fc_v_non_chunked h5fc_v_non_chunked.ddl 0 old_h5fc_ext_none.h5 -d /DSET_CONTIGUOUS -v)
-  ADD_H5_OUTPUT (h5fc_v_bt1 h5fc_v_bt1.ddl 0 old_h5fc_ext_none.h5 -d /GROUP/DSET_BT2 --verbose)
-  ADD_H5_OUTPUT (h5fc_v_ndata_bt1 h5fc_v_ndata_bt1.ddl 0 old_h5fc_ext_none.h5 -d /DSET_NDATA_BT2 -v -n)
-  ADD_H5_OUTPUT (h5fc_v_all h5fc_v_all.ddl 0 old_h5fc_ext_none.h5 -v)
+  ADD_H5_NOERR_OUTPUT (h5fc_v_non_chunked h5fc_v_non_chunked.ddl 0 old_h5fc_ext_none.h5 -d /DSET_CONTIGUOUS -v)
+  ADD_H5_NOERR_OUTPUT (h5fc_v_bt1 h5fc_v_bt1.ddl 0 old_h5fc_ext_none.h5 -d /GROUP/DSET_BT2 --verbose)
+  ADD_H5_NOERR_OUTPUT (h5fc_v_ndata_bt1 h5fc_v_ndata_bt1.ddl 0 old_h5fc_ext_none.h5 -d /DSET_NDATA_BT2 -v -n)
+  ADD_H5_NOERR_OUTPUT (h5fc_v_all h5fc_v_all.ddl 0 old_h5fc_ext_none.h5 -v)
 #
 #
 #
 # h5format_convert -d /DSET_EA -v -n h5fc_ext_none.h5 (verbose, noop, one ea dataset)
 # h5format_convert -v -n h5fc_non_v3.h5 (verbose, noop, all datasets)
-  ADD_H5_OUTPUT (h5fc_v_n_1d h5fc_v_n_1d.ddl 0 h5fc_ext_none.h5 -d /DSET_EA -v -n)
-  ADD_H5_OUTPUT (h5fc_v_n_all h5fc_v_n_all.ddl 0 h5fc_non_v3.h5 -v -n)
+  ADD_H5_NOERR_OUTPUT (h5fc_v_n_1d h5fc_v_n_1d.ddl 0 h5fc_ext_none.h5 -d /DSET_EA -v -n)
+  ADD_H5_NOERR_OUTPUT (h5fc_v_n_all h5fc_v_n_all.ddl 0 h5fc_non_v3.h5 -v -n)
 #
 #
 #
diff --git a/tools/test/h5format_convert/Makefile.in b/tools/test/h5format_convert/Makefile.in
index 3f0005a..da61977 100644
--- a/tools/test/h5format_convert/Makefile.in
+++ b/tools/test/h5format_convert/Makefile.in
@@ -555,7 +555,6 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MEMORYALLOCSANITYCHECK = @MEMORYALLOCSANITYCHECK@
-METADATATRACEFILE = @METADATATRACEFILE@
 MKDIR_P = @MKDIR_P@
 MPE = @MPE@
 NM = @NM@
@@ -589,6 +588,7 @@ PAC_FORTRAN_NUM_INTEGER_KINDS = @PAC_FORTRAN_NUM_INTEGER_KINDS@
 PARALLEL = @PARALLEL@
 PARALLEL_FILTERED_WRITES = @PARALLEL_FILTERED_WRITES@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PREADWRITE = @PREADWRITE@
 PROFILING = @PROFILING@
 RANLIB = @RANLIB@
 ROOT = @ROOT@
@@ -1434,7 +1434,7 @@ build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
 	    echo "**** Hint ****";                                            \
 	    echo "Parallel test files reside in the current directory"        \
 	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
+	    echo "Set HDF5_PARAPREFIX to use another directory. e.g.,";       \
 	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
 	    echo "    export HDF5_PARAPREFIX";                                \
 	    echo "    make check";                                            \
diff --git a/tools/test/h5format_convert/h5fc_gentest.c b/tools/test/h5format_convert/h5fc_gentest.c
index 8c873be..b482dee 100644
--- a/tools/test/h5format_convert/h5fc_gentest.c
+++ b/tools/test/h5format_convert/h5fc_gentest.c
@@ -14,7 +14,7 @@
 /*
  * Generate the binary hdf5 files for the h5format_convert tests.
  * Usage: just execute the program without any arguments will
- * generate all the binary hdf5 files 
+ * generate all the binary hdf5 files
  *
  * If you regenerate the test files (e.g., changing some code,
  * trying it on a new platform, ...), you need to verify the correctness
@@ -24,71 +24,71 @@
 #include "hdf5.h"
 #include "H5private.h"
 
-#define NON_V3_FILE		"h5fc_non_v3.h5"
-#define EDGE_V3_FILE		"h5fc_edge_v3.h5"
-#define ERR_LEVEL_FILE		"h5fc_err_level.h5"
+#define NON_V3_FILE        "h5fc_non_v3.h5"
+#define EDGE_V3_FILE        "h5fc_edge_v3.h5"
+#define ERR_LEVEL_FILE        "h5fc_err_level.h5"
 
 const char *FILENAME[] = {
-    "h5fc_ext1_i.h5",	/* 0 */
-    "h5fc_ext1_s.h5",	/* 1 */
-    "h5fc_ext1_f.h5",	/* 2 */
-    "h5fc_ext2_is.h5", 	/* 3 */
-    "h5fc_ext2_if.h5",	/* 4 */
-    "h5fc_ext2_sf.h5", 	/* 5 */
-    "h5fc_ext3_isf.h5",	/* 6 */ 
-    "h5fc_ext_none.h5",	/* 7 */ 
+    "h5fc_ext1_i.h5",    /* 0 */
+    "h5fc_ext1_s.h5",    /* 1 */
+    "h5fc_ext1_f.h5",    /* 2 */
+    "h5fc_ext2_is.h5",     /* 3 */
+    "h5fc_ext2_if.h5",    /* 4 */
+    "h5fc_ext2_sf.h5",     /* 5 */
+    "h5fc_ext3_isf.h5",    /* 6 */
+    "h5fc_ext_none.h5",    /* 7 */
     NULL
 };
 
-#define GROUP			"GROUP"
+#define GROUP            "GROUP"
 
-#define DSET_COMPACT		"DSET_COMPACT"
-#define DSET_CONTIGUOUS		"DSET_CONTIGUOUS"
+#define DSET_COMPACT        "DSET_COMPACT"
+#define DSET_CONTIGUOUS        "DSET_CONTIGUOUS"
 
-#define DSET_EA			"DSET_EA"
-#define DSET_NDATA_EA		"DSET_NDATA_EA"
-#define DSET_BT2		"DSET_BT2"
-#define DSET_NDATA_BT2		"DSET_NDATA_BT2"
-#define DSET_FA			"DSET_FA"
-#define DSET_NDATA_FA		"DSET_NDATA_FA"
-#define DSET_NONE		"DSET_NONE"
-#define DSET_NDATA_NONE		"DSET_NDATA_NONE"
+#define DSET_EA            "DSET_EA"
+#define DSET_NDATA_EA        "DSET_NDATA_EA"
+#define DSET_BT2        "DSET_BT2"
+#define DSET_NDATA_BT2        "DSET_NDATA_BT2"
+#define DSET_FA            "DSET_FA"
+#define DSET_NDATA_FA        "DSET_NDATA_FA"
+#define DSET_NONE        "DSET_NONE"
+#define DSET_NDATA_NONE        "DSET_NDATA_NONE"
 
-#define DSET_EDGE		"DSET_EDGE"
-#define DSET_ERR		"DSET_ERR"
+#define DSET_EDGE        "DSET_EDGE"
+#define DSET_ERR        "DSET_ERR"
 
 #define ISTORE_IK  64
-#define ISTORE_ERR 1 
+#define ISTORE_ERR 1
 
 #define NUM 500
 
 
 /*
- * Function: gen_non() 
+ * Function: gen_non()
  *
  * Create a file with SWMR write+non-latest-format--this will result in v3 superbock+latest version support:
- *	1) 1 chunked dataset with extensible array chunk indexing type (without data)
- *	2) 1 chunked dataset with version 2 B-tree chunk indexing type (with data)
+ *    1) 1 chunked dataset with extensible array chunk indexing type (without data)
+ *    2) 1 chunked dataset with version 2 B-tree chunk indexing type (with data)
  * Re-open the file with write+non-latest-format and create:
- *	3) 1 chunked dataset with version 2 B-tree chunk indexing type (without data)
- * 	4) 1 chunked dataset with extensible array indexing type (with data)
- *	5) 1 compact and 1 contiguous datasets
+ *    3) 1 chunked dataset with version 2 B-tree chunk indexing type (without data)
+ *     4) 1 chunked dataset with extensible array indexing type (with data)
+ *    5) 1 compact and 1 contiguous datasets
  */
 static void
 gen_non(const char *fname)
 {
-    hid_t	fid = -1;		/* file id */
-    hid_t	fcpl = -1;		/* file creation property list */
-    hid_t	gid = -1;		/* group id */
-    hid_t   	sid = -1;       	/* space id */
-    hid_t	dcpl = -1;		/* dataset creation property id */
-    hid_t	did1 = -1, did2 = -1;	/* dataset id */
-    hsize_t 	dims1[1] = {10};     	/* dataset dimension */
-    hsize_t 	dims2[2] = {4, 6};     	/* dataset dimension */
-    hsize_t	max_dims[2];		/* maximum dataset dimension */
-    hsize_t 	c_dims[2] = {2, 3};    	/* chunk dimension */
-    int		i;		    	/* local index variable */
-    int     	buf[24];            	/* data buffer */
+    hid_t    fid = -1;        /* file id */
+    hid_t    fcpl = -1;        /* file creation property list */
+    hid_t    gid = -1;        /* group id */
+    hid_t       sid = -1;           /* space id */
+    hid_t    dcpl = -1;        /* dataset creation property id */
+    hid_t    did1 = -1, did2 = -1;    /* dataset id */
+    hsize_t     dims1[1] = {10};         /* dataset dimension */
+    hsize_t     dims2[2] = {4, 6};         /* dataset dimension */
+    hsize_t    max_dims[2];        /* maximum dataset dimension */
+    hsize_t     c_dims[2] = {2, 3};        /* chunk dimension */
+    int        i;                /* local index variable */
+    int         buf[24];                /* data buffer */
 
     if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
         goto error;
@@ -115,7 +115,7 @@ gen_non(const char *fname)
     if(H5Pset_chunk(dcpl, 2, c_dims) < 0)
         goto error;
 
-    /* 
+    /*
      * Create a chunked dataset with extensible array chunk indexing type (without data)
      */
 
@@ -135,7 +135,7 @@ gen_non(const char *fname)
     if(H5Dclose(did1) < 0)
         goto error;
 
-    /* 
+    /*
      * Create a chunked dataset with version 2 B-tree chunk indexing type (with data)
      */
 
@@ -226,7 +226,7 @@ gen_non(const char *fname)
     if(H5Dclose(did2) < 0)
         goto error;
 
-    /* 
+    /*
      * Create a compact dataset in the group
      */
 
@@ -251,7 +251,7 @@ gen_non(const char *fname)
     if(H5Sclose(sid) < 0)
         goto error;
 
-    /* 
+    /*
      * Create a contiguous dataset with (2d with data) in the file
      */
     if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
@@ -278,9 +278,9 @@ gen_non(const char *fname)
         goto error;
 
     if(H5Gclose(gid) < 0)
-	goto error;
+    goto error;
     if(H5Pclose(fcpl) < 0)
-	goto error;
+    goto error;
     if(H5Fclose(fid) < 0)
         goto error;
 
@@ -298,24 +298,24 @@ error:
 } /* gen_non() */
 
 /*
- * Function: gen_edge() 
+ * Function: gen_edge()
  *
  * Create a file with write+latest-format--this will result in v3 superblock+latest version support:
- *	A dataset: chunked, filtered, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS enabled
- *	(i.e. the dataset does not filter partial edge chunks)
+ *    A dataset: chunked, filtered, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS enabled
+ *    (i.e. the dataset does not filter partial edge chunks)
  */
 static void
 gen_edge(const char *fname)
 {
-    hid_t	fid = -1;	    	/* file id */
-    hid_t	fapl = -1;	       	/* file access property list */
-    hid_t   	sid = -1;       	/* dataspace id */
-    hid_t	dcpl = -1;	    	/* dataset creation property id */
-    hid_t	did = -1;		/* dataset id */
-    hsize_t 	dims2[2] = {12, 6};	/* Dataset dimensions */
-    hsize_t 	c_dims[2] = {5, 5};	/* Chunk dimensions */
-    float 	buf[12][6];            	/* Buffer for writing data */
-    int		i, j;		    	/* local index variable */
+    hid_t    fid = -1;            /* file id */
+    hid_t    fapl = -1;               /* file access property list */
+    hid_t       sid = -1;           /* dataspace id */
+    hid_t    dcpl = -1;            /* dataset creation property id */
+    hid_t    did = -1;        /* dataset id */
+    hsize_t     dims2[2] = {12, 6};    /* Dataset dimensions */
+    hsize_t     c_dims[2] = {5, 5};    /* Chunk dimensions */
+    float     buf[12][6];                /* Buffer for writing data */
+    int        i, j;                /* local index variable */
 
     /* Create a new format file */
     if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
@@ -377,37 +377,37 @@ error:
 
 
 /*
- * Function: gen_err_level() 
+ * Function: gen_err_level()
  *
  * Generate a file to test the situtation described in HDFFV-9434:
- *	Exceed the limit of v1-btree level
+ *    Exceed the limit of v1-btree level
  *
- *	Create a file with H5Pset_istore_k(fcpl, 1).
- *	Create a chunked dataset with extensible array chunk index and 
- *	appends many chunks to the dataset.
+ *    Create a file with H5Pset_istore_k(fcpl, 1).
+ *    Create a chunked dataset with extensible array chunk index and
+ *    appends many chunks to the dataset.
  *
- *	When h5format_convert tries to convert the dataset with
- *	extensive array index in the file to v1-btree chunk index, 
- *	it will insert the dataset chunks to the v1-btree chunk index.
- *	The tree will split quickly due to the 'K' value of 1 and the 
- *	tree level will eventually hit the maximum: 2^8(256).
+ *    When h5format_convert tries to convert the dataset with
+ *    extensive array index in the file to v1-btree chunk index,
+ *    it will insert the dataset chunks to the v1-btree chunk index.
+ *    The tree will split quickly due to the 'K' value of 1 and the
+ *    tree level will eventually hit the maximum: 2^8(256).
  */
 static void
 gen_err_level(const char *fname)
 {
-    hid_t fid = -1;	    	/* file ID */
-    hid_t fapl = -1;	       	/* file access property list */
-    hid_t fcpl = -1;	       	/* file creation property list */
-    hid_t sid = -1;       	/* dataspace id */
-    hid_t dcpl = -1;		/* dataset creation property list */
-    hid_t did = -1;		/* dataset ID */
-    hid_t fsid = -1;		/* file dataspace ID */
-    hid_t msid = -1;		/* memory dataspace ID */
-    unsigned char *buf = NULL;	/* buffer for data */
-    hsize_t dims[2] = {0, 1};			/* dataset dimension sizes */
-    hsize_t max_dims[2] = {1, H5S_UNLIMITED};	/* dataset maximum dimension sizes */
-    hsize_t chunk_dims[2] = {1, 1};		/* chunk dimension sizes */
-    int	n = 0;			/* local index variable */
+    hid_t fid = -1;            /* file ID */
+    hid_t fapl = -1;               /* file access property list */
+    hid_t fcpl = -1;               /* file creation property list */
+    hid_t sid = -1;           /* dataspace id */
+    hid_t dcpl = -1;        /* dataset creation property list */
+    hid_t did = -1;        /* dataset ID */
+    hid_t fsid = -1;        /* file dataspace ID */
+    hid_t msid = -1;        /* memory dataspace ID */
+    unsigned char *buf = NULL;    /* buffer for data */
+    hsize_t dims[2] = {0, 1};            /* dataset dimension sizes */
+    hsize_t max_dims[2] = {1, H5S_UNLIMITED};    /* dataset maximum dimension sizes */
+    hsize_t chunk_dims[2] = {1, 1};        /* chunk dimension sizes */
+    int    n = 0;            /* local index variable */
 
     /* Create a new format file */
     if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
@@ -440,6 +440,8 @@ gen_err_level(const char *fname)
         goto error;
 
     /* Closing */
+    if(H5Pclose(fcpl) < 0)
+        goto error;
     if(H5Pclose(dcpl) < 0)
         goto error;
     if(H5Sclose(sid) < 0)
@@ -459,50 +461,51 @@ gen_err_level(const char *fname)
 
     /* Loop through appending 1 element at a time */
     for(n = 0; n < NUM; n++) {
-	hsize_t start[2] = {0, 0};
-	hsize_t count[2] = {1, 1};
-	hsize_t extent[2] = {0, 0};
-
-	start[0] = 0;
-	start[1] = (hsize_t)n;
-	extent[0] = 1;
-	extent[1] = (hsize_t)(n + 1);
-
-	/* Set current dimension sizes for the dataset */
-	if(H5Dset_extent(did, extent) < 0)
-	    goto error;
-
-	/* Set up memory dataspace */
-	if((msid = H5Screate_simple(2, count, NULL)) < 0)
-	    goto error;
-
-	/* Get file dataspace */
-	if((fsid = H5Dget_space(did)) < 0)
-	    goto error;
-
-	if((H5Sselect_hyperslab(fsid, H5S_SELECT_SET, start, NULL, count, NULL)) < 0)
-	    goto error;
-
-	/* Write to the dataset */
-	if(H5Dwrite(did, H5T_NATIVE_UCHAR, msid, fsid, H5P_DEFAULT, buf) < 0)
-	    goto error;
-
-	if(H5Sclose(fsid) < 0)
-	    goto error;
-	if(H5Sclose(msid) < 0)
-	    goto error;
+    hsize_t start[2] = {0, 0};
+    hsize_t count[2] = {1, 1};
+    hsize_t extent[2] = {0, 0};
+
+    start[0] = 0;
+    start[1] = (hsize_t)n;
+    extent[0] = 1;
+    extent[1] = (hsize_t)(n + 1);
+
+    /* Set current dimension sizes for the dataset */
+    if(H5Dset_extent(did, extent) < 0)
+        goto error;
+
+    /* Set up memory dataspace */
+    if((msid = H5Screate_simple(2, count, NULL)) < 0)
+        goto error;
+
+    /* Get file dataspace */
+    if((fsid = H5Dget_space(did)) < 0)
+        goto error;
+
+    if((H5Sselect_hyperslab(fsid, H5S_SELECT_SET, start, NULL, count, NULL)) < 0)
+        goto error;
+
+    /* Write to the dataset */
+    if(H5Dwrite(did, H5T_NATIVE_UCHAR, msid, fsid, H5P_DEFAULT, buf) < 0)
+        goto error;
+
+    if(H5Sclose(fsid) < 0)
+        goto error;
+    if(H5Sclose(msid) < 0)
+        goto error;
     }
 
     /* Closing */
     if(H5Dclose(did) < 0)
-	goto error;
+    goto error;
     if(H5Fclose(fid) < 0)
-	goto error;
+    goto error;
     if(H5Pclose(fapl) < 0)
-	goto error;
-    if(buf) free(buf);
+    goto error;
 
 error:
+    if(buf)
+        free(buf);
     H5E_BEGIN_TRY {
         H5Pclose(dcpl);
         H5Sclose(sid);
@@ -517,33 +520,33 @@ error:
 } /* gen_err_level() */
 
 /*
- * Function: gen_ext() 
+ * Function: gen_ext()
  *
  * Create a file with/without latest format with:
- *	1) 1 contiguous dataset (without data)
- *	2) 2 chunked datasets with extensible array chunk indexing type (with/without data)
- *	3) 2 chunked datasets with version 2 B-tree chunk indexing type (with/without data)
- *	4) 2 chunked datasets with fixed array chunk indexing type (with/without data)
- *	5) 2 chunked datasets with implicit array chunk indexing type (with/without data)
+ *    1) 1 contiguous dataset (without data)
+ *    2) 2 chunked datasets with extensible array chunk indexing type (with/without data)
+ *    3) 2 chunked datasets with version 2 B-tree chunk indexing type (with/without data)
+ *    4) 2 chunked datasets with fixed array chunk indexing type (with/without data)
+ *    5) 2 chunked datasets with implicit array chunk indexing type (with/without data)
  * It will create the file with/without messages in the superblock extension depending
  * on the parameter "what".
  */
 static void
 gen_ext(const char *fname, unsigned new_format, unsigned what)
 {
-    hid_t	fid = -1;	 	/* file id */
-    hid_t	fapl = -1;	       	/* file access property list */
-    hid_t	fcpl = -1;	       	/* file creation property list */
-    hid_t	gid = -1;	       	/* group id */
-    hid_t   	sid = -1;       	/* space id */
-    hid_t	dcpl = -1;	    	/* dataset creation property id */
-    hid_t	did1 = -1, did2 = -1;	/* dataset id */
-    hsize_t 	dims1[1] = {10};     	/* dataset dimension */
-    hsize_t 	dims2[2] = {4, 6};     	/* dataset dimension */
-    hsize_t	max_dims[2];		/* maximum dataset dimension */
-    hsize_t 	c_dims[2] = {2, 3};    	/* chunk dimension */
-    int		i;		    	/* local index variable */
-    int     	buf[24];            	/* data buffer */
+    hid_t    fid = -1;         /* file id */
+    hid_t    fapl = -1;               /* file access property list */
+    hid_t    fcpl = -1;               /* file creation property list */
+    hid_t    gid = -1;               /* group id */
+    hid_t       sid = -1;           /* space id */
+    hid_t    dcpl = -1;            /* dataset creation property id */
+    hid_t    did1 = -1, did2 = -1;    /* dataset id */
+    hsize_t     dims1[1] = {10};         /* dataset dimension */
+    hsize_t     dims2[2] = {4, 6};         /* dataset dimension */
+    hsize_t    max_dims[2];        /* maximum dataset dimension */
+    hsize_t     c_dims[2] = {2, 3};        /* chunk dimension */
+    int        i;                /* local index variable */
+    int         buf[24];                /* data buffer */
 
     if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         goto error;
@@ -559,34 +562,34 @@ gen_ext(const char *fname, unsigned new_format, unsigned what)
 
     /* Generate messages that might be placed in superblock extension */
     switch(what) {
-	case 0:
-	    H5Pset_istore_k(fcpl, ISTORE_IK);
-	    break;
-	case 1:
-	    H5Pset_shared_mesg_nindexes(fcpl, 4);
-	    break;
-	case 2:
-	    H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1);
-	    break;
-	case 3:
-	    H5Pset_istore_k(fcpl, ISTORE_IK);
-	    H5Pset_shared_mesg_nindexes(fcpl, 4);
-	    break;
-	case 4:
-	    H5Pset_istore_k(fcpl, ISTORE_IK);
-	    H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1);
-	    break;
-	case 5:
-	    H5Pset_shared_mesg_nindexes(fcpl, 4);
-	    H5Pset_file_space_page_size(fcpl, (hsize_t)512);
-	    break;
-	case 6:
-	    H5Pset_istore_k(fcpl, ISTORE_IK);
-	    H5Pset_shared_mesg_nindexes(fcpl, 4);
-	    H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, FALSE, (hsize_t)1);
-	    break;
-	default:
-	    break;
+    case 0:
+        H5Pset_istore_k(fcpl, ISTORE_IK);
+        break;
+    case 1:
+        H5Pset_shared_mesg_nindexes(fcpl, 4);
+        break;
+    case 2:
+        H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1);
+        break;
+    case 3:
+        H5Pset_istore_k(fcpl, ISTORE_IK);
+        H5Pset_shared_mesg_nindexes(fcpl, 4);
+        break;
+    case 4:
+        H5Pset_istore_k(fcpl, ISTORE_IK);
+        H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1);
+        break;
+    case 5:
+        H5Pset_shared_mesg_nindexes(fcpl, 4);
+        H5Pset_file_space_page_size(fcpl, (hsize_t)512);
+        break;
+    case 6:
+        H5Pset_istore_k(fcpl, ISTORE_IK);
+        H5Pset_shared_mesg_nindexes(fcpl, 4);
+        H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, FALSE, (hsize_t)1);
+        break;
+    default:
+        break;
     }
 
     /* Create the file */
@@ -604,8 +607,8 @@ gen_ext(const char *fname, unsigned new_format, unsigned what)
         goto error;
 
 
-    /* 
-     * Create a contiguous dataset 
+    /*
+     * Create a contiguous dataset
      */
 
     /* Create dataspace */
@@ -622,8 +625,8 @@ gen_ext(const char *fname, unsigned new_format, unsigned what)
     if(H5Dclose(did1) < 0)
         goto error;
 
-    /* 
-     * Create 2 chunked datasets with extensible array chunk indexing type 
+    /*
+     * Create 2 chunked datasets with extensible array chunk indexing type
      * (one with data; one without data)
      */
 
@@ -657,8 +660,8 @@ gen_ext(const char *fname, unsigned new_format, unsigned what)
         goto error;
 
 
-    /* 
-     * Create 2 chunked datasets with version 2 B-tree chunk indexing type 
+    /*
+     * Create 2 chunked datasets with version 2 B-tree chunk indexing type
      * (one with data; one without data)
      */
 
@@ -689,7 +692,7 @@ gen_ext(const char *fname, unsigned new_format, unsigned what)
         goto error;
 
     /*
-     * Create 2 chunked datasets with fixed array chunk indexing type 
+     * Create 2 chunked datasets with fixed array chunk indexing type
      * (one with data; one without data)
      */
 
@@ -719,8 +722,8 @@ gen_ext(const char *fname, unsigned new_format, unsigned what)
         goto error;
 
 
-    /* 
-     * Create 2 chunked datasets with implicit chunk indexing type 
+    /*
+     * Create 2 chunked datasets with implicit chunk indexing type
      * (one with data; one without data)
      */
 
diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file-d.ddl b/tools/test/h5format_convert/testfiles/h5fc_d_file-d.ddl
new file mode 100644
index 0000000..bc0229c
--- /dev/null
+++ b/tools/test/h5format_convert/testfiles/h5fc_d_file-d.ddl
@@ -0,0 +1,25 @@
+usage: h5format_convert [OPTIONS] file_name
+  OPTIONS
+   -h, --help                Print a usage message and exit
+   -V, --version             Print version number and exit
+   -v, --verbose             Turn on verbose mode
+   -d dname, --dname=dataset_name    Pathname for the dataset
+   -n, --noop                Perform all the steps except the actual conversion
+
+Examples of use:
+
+h5format_convert -d /group/dataset file_name
+  Convert the dataset </group/dataset> in the HDF5 file <file_name>:
+    a. chunked dataset: convert the chunk indexing type to version 1 B-tree
+    b. compact/contiguous dataset: downgrade the layout version to 3
+    c. virtual dataset: no action
+
+h5format_convert file_name
+  Convert all datasets in the HDF5 file <file_name>:
+    a. chunked dataset: convert the chunk indexing type to version 1 B-tree
+    b. compact/contiguous dataset: downgrade the layout version to 3
+    c. virtual dataset: no action
+
+h5format_convert -n -d /group/dataset file_name
+  Go through all the steps except the actual conversion when 
+  converting the dataset </group/dataset> in the HDF5 file <file_name>.
diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl b/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl
index 38fc432..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl
+++ b/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl
@@ -23,4 +23,3 @@ h5format_convert file_name
 h5format_convert -n -d /group/dataset file_name
   Go through all the steps except the actual conversion when 
   converting the dataset </group/dataset> in the HDF5 file <file_name>.
-h5format_convert error: missing file name
diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl.err b/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl.err
new file mode 100644
index 0000000..ceb0fe4
--- /dev/null
+++ b/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl.err
@@ -0,0 +1 @@
+h5format_convert error: missing file name
diff --git a/tools/test/h5format_convert/testfiles/h5fc_dname.ddl b/tools/test/h5format_convert/testfiles/h5fc_dname.ddl
index 48564b7..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_dname.ddl
+++ b/tools/test/h5format_convert/testfiles/h5fc_dname.ddl
@@ -23,4 +23,3 @@ h5format_convert file_name
 h5format_convert -n -d /group/dataset file_name
   Go through all the steps except the actual conversion when 
   converting the dataset </group/dataset> in the HDF5 file <file_name>.
-h5format_convert error: No dataset name
diff --git a/tools/test/h5format_convert/testfiles/h5fc_dname.err b/tools/test/h5format_convert/testfiles/h5fc_dname.err
new file mode 100644
index 0000000..361d8a9
--- /dev/null
+++ b/tools/test/h5format_convert/testfiles/h5fc_dname.err
@@ -0,0 +1 @@
+h5format_convert error: No dataset name
diff --git a/tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl b/tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl.err
index 39450c0..39450c0 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl
+++ b/tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl b/tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl.err
index 706ea9d..706ea9d 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl
+++ b/tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl.err
diff --git a/tools/test/h5format_convert/testh5fc.sh.in b/tools/test/h5format_convert/testh5fc.sh.in
index 585d389..2cdd445 100644
--- a/tools/test/h5format_convert/testh5fc.sh.in
+++ b/tools/test/h5format_convert/testh5fc.sh.in
@@ -103,13 +103,18 @@ $SRC_H5FORMCONV_TESTFILES/old_h5fc_ext3_isf.h5
 $SRC_H5FORMCONV_TESTFILES/h5fc_err_level.h5
 "
 
+LIST_ERR_TEST_FILES="
+$SRC_H5FORMCONV_TESTFILES/h5fc_d_file.ddl.err
+$SRC_H5FORMCONV_TESTFILES/h5fc_dname.err
+$SRC_H5FORMCONV_TESTFILES/h5fc_nonexistfile.ddl.err
+$SRC_H5FORMCONV_TESTFILES/h5fc_nonexistdset_file.ddl.err
+"
+
 LIST_OTHER_TEST_FILES="
 $SRC_H5FORMCONV_TESTFILES/h5fc_help.ddl
 $SRC_H5FORMCONV_TESTFILES/h5fc_nooption.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_nonexistfile.ddl
 $SRC_H5FORMCONV_TESTFILES/h5fc_d_file.ddl
 $SRC_H5FORMCONV_TESTFILES/h5fc_dname.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_nonexistdset_file.ddl
 $SRC_H5FORMCONV_TESTFILES/h5fc_v_non_chunked.ddl
 $SRC_H5FORMCONV_TESTFILES/h5fc_v_bt1.ddl
 $SRC_H5FORMCONV_TESTFILES/h5fc_v_ndata_bt1.ddl
@@ -137,7 +142,7 @@ $SRC_H5FORMCONV_TESTFILES/h5fc_v_err.ddl.err
 #
 # copy test files and expected output files from source dirs to test dir
 #
-COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_OTHER_TEST_FILES"
+COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_ERR_TEST_FILES $LIST_OTHER_TEST_FILES"
 
 COPY_TESTFILES_TO_TESTDIR()
 {
@@ -193,6 +198,9 @@ TESTING() {
    echo "Testing $* $SPACES" | cut -c1-80 | tr -d '\012'
 }
 
+# Source in the output filter function definitions.
+. $srcdir/../../../bin/output_filter.sh
+
 # Run a test and print PASS or *FAIL*.  If a test fails then increment
 # the `nerrors' global variable and (if $verbose is set) display the
 # difference between the actual output and the expected output. The
@@ -212,8 +220,9 @@ TESTING() {
 TOOLTEST_OUT() {
     # Prepare expected and actual output
     expect="$TESTDIR/$1"
+    expect_err="$TESTDIR/`basename $1 .ddl`.err"
     actual="$TESTDIR/`basename $1 .ddl`.out"
-    actual_err="$TESTDIR/`basename $1 .ddl`.err"
+    actual_err="$TESTDIR/`basename $1 .ddl`.out.err"
     actual_sav=${actual}-sav
     actual_err_sav=${actual_err}-sav
 
@@ -233,7 +242,6 @@ TOOLTEST_OUT() {
     ) >$actual 2>$actual_err
     cp $actual $actual_sav
     cp $actual_err $actual_err_sav
-    cat $actual_err >> $actual
 
     # Compare output
     COMPARE_OUT $expect $actual
@@ -251,7 +259,7 @@ TOOLTEST_MASK_OUT() {
     expect_err="$TESTDIR/$1.err"
     actual_ext="$TESTDIR/$1.ext"
     actual="$TESTDIR/`basename $1 .ddl`.out"
-    actual_err="$TESTDIR/`basename $1 .ddl`.err"
+    actual_err="$TESTDIR/`basename $1 .ddl`.out.err"
     actual_sav=${actual}-sav
     actual_err_sav=${actual_err}-sav
 
@@ -305,6 +313,42 @@ TOOLTEST_MASK_OUT() {
     $RM $actual $actual_err $actual_sav $actual_err_sav
     fi
 }
+# Same as TOOLTEST_OUT except only compares error outout
+TOOLTEST_ERR() {
+    # Prepare expected and actual output
+    expect="$TESTDIR/$1"
+    expect_err="$TESTDIR/$1.err"
+    actual="$TESTDIR/`basename $1 .ddl`.out"
+    actual_err="$TESTDIR/`basename $1 .ddl`.out.err"
+    actual_sav=${actual}-sav
+    actual_err_sav=${actual_err}-sav
+
+    # Prepare the test file
+    $RM $TESTDIR/$TMPOUTFILE
+    TFILE=$2
+    if [ ! -z "$2" ] && [ -e $TESTDIR/$2 ] ; then
+    $CP $TESTDIR/$2 $TESTDIR/$TMPOUTFILE
+    TFILE=$TMPOUTFILE
+    fi
+
+    # Run test.
+    TESTING $FORMCONV $3 $4 $5 $6 $2
+    (
+    cd $TESTDIR
+    $RUNSERIAL $FORMCONV_BIN $3 $4 $5 $6 $TFILE
+    ) >$actual 2>$actual_err
+    cp $actual $actual_sav
+    cp $actual_err $actual_err_sav
+
+    # Compare output
+    COMPARE_OUT $expect_err $actual_err
+
+    # Clean up output file
+    if test -z "$HDF5_NOCLEANUP"; then
+    $RM $actual $actual_err
+    $RM $actual $actual_err $actual_sav $actual_err_sav
+    fi
+}
 
 # To check that the tool exits success, no output
 # Assume all short options
@@ -406,7 +450,7 @@ COPY_TESTFILES_TO_TESTDIR
 # h5format_convert nonexist.h5  (no options, file does not exist)
 TOOLTEST_OUT h5fc_help.ddl '' --help
 TOOLTEST_OUT h5fc_nooption.ddl ''
-TOOLTEST_OUT h5fc_nonexistfile.ddl nonexist.h5
+TOOLTEST_ERR h5fc_nonexistfile.ddl nonexist.h5
 #
 #
 # h5format_convert -d old_h5fc_ext_none.h5 (just -d option, file exists)
@@ -416,7 +460,7 @@ TOOLTEST_OUT h5fc_nonexistfile.ddl nonexist.h5
 TOOLTEST_OUT h5fc_d_file.ddl old_h5fc_ext_none.h5 -d
 TOOLTEST_OUT h5fc_d_file.ddl old_h5fc_ext_none.h5 --dname
 TOOLTEST_OUT h5fc_dname.ddl '' --dname
-TOOLTEST_OUT h5fc_nonexistdset_file.ddl old_h5fc_ext_none.h5 --dname=nonexist
+TOOLTEST_ERR h5fc_nonexistdset_file.ddl old_h5fc_ext_none.h5 --dname=nonexist
 #
 #
 #