Sync tools with develop (#3301)

11 files changed, 36 insertions, 6 deletions

diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c
index 0661b5a..37c2cc3 100644
--- a/tools/test/h5diff/h5diffgentest.c
+++ b/tools/test/h5diff/h5diffgentest.c
@@ -538,7 +538,7 @@ error:
         H5Sclose(space);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return -1;
 } /* test_onion_1d_dset */
@@ -972,7 +972,7 @@ error:
         H5Pclose(fapl_id);
         H5Pclose(onion_info.backing_fapl_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return -1;
 } /* test_onion_dset_extension */
@@ -5656,7 +5656,7 @@ error:
         H5Tclose(tid1);
         H5Tclose(tid2);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 }
 
 static hid_t
@@ -8649,7 +8649,7 @@ out:
         H5Dclose(did);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 }
 
@@ -8703,7 +8703,7 @@ error:
         H5Fclose(fid1);
         H5Fclose(fid2);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 }
 
 /*-------------------------------------------------------------------------
@@ -8787,7 +8787,7 @@ error:
         H5Dclose(did);
         H5Sclose(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return FAIL;
 } /* end write_dset() */
diff --git a/tools/test/h5diff/testfiles/h5diff_10.txt b/tools/test/h5diff/testfiles/h5diff_10.txt
index fe3474c..dbd5418 100644
--- a/tools/test/h5diff/testfiles/h5diff_10.txt
+++ b/tools/test/h5diff/testfiles/h5diff_10.txt
@@ -37,6 +37,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            HDF5 file specified
    --vol-info-2            VOL-specific info to pass to the VOL connector used for
                            opening the second HDF5 file specified
+                           If none of the above options are used to specify a VOL for a file, then
+                           the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,
+                           if that environment variable is unset) will be used
    --vfd-value-1           Value (ID) of the VFL driver to use for opening the
                            first HDF5 file specified
    --vfd-name-1            Name of the VFL driver to use for opening the first
diff --git a/tools/test/h5diff/testfiles/h5diff_600.txt b/tools/test/h5diff/testfiles/h5diff_600.txt
index eaf9c15..46a1c45 100644
--- a/tools/test/h5diff/testfiles/h5diff_600.txt
+++ b/tools/test/h5diff/testfiles/h5diff_600.txt
@@ -37,6 +37,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            HDF5 file specified
    --vol-info-2            VOL-specific info to pass to the VOL connector used for
                            opening the second HDF5 file specified
+                           If none of the above options are used to specify a VOL for a file, then
+                           the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,
+                           if that environment variable is unset) will be used
    --vfd-value-1           Value (ID) of the VFL driver to use for opening the
                            first HDF5 file specified
    --vfd-name-1            Name of the VFL driver to use for opening the first
diff --git a/tools/test/h5diff/testfiles/h5diff_603.txt b/tools/test/h5diff/testfiles/h5diff_603.txt
index aa0697a..e930dbe 100644
--- a/tools/test/h5diff/testfiles/h5diff_603.txt
+++ b/tools/test/h5diff/testfiles/h5diff_603.txt
@@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            HDF5 file specified
    --vol-info-2            VOL-specific info to pass to the VOL connector used for
                            opening the second HDF5 file specified
+                           If none of the above options are used to specify a VOL for a file, then
+                           the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,
+                           if that environment variable is unset) will be used
    --vfd-value-1           Value (ID) of the VFL driver to use for opening the
                            first HDF5 file specified
    --vfd-name-1            Name of the VFL driver to use for opening the first
diff --git a/tools/test/h5diff/testfiles/h5diff_606.txt b/tools/test/h5diff/testfiles/h5diff_606.txt
index 87d6b01..02b80eb 100644
--- a/tools/test/h5diff/testfiles/h5diff_606.txt
+++ b/tools/test/h5diff/testfiles/h5diff_606.txt
@@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            HDF5 file specified
    --vol-info-2            VOL-specific info to pass to the VOL connector used for
                            opening the second HDF5 file specified
+                           If none of the above options are used to specify a VOL for a file, then
+                           the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,
+                           if that environment variable is unset) will be used
    --vfd-value-1           Value (ID) of the VFL driver to use for opening the
                            first HDF5 file specified
    --vfd-name-1            Name of the VFL driver to use for opening the first
diff --git a/tools/test/h5diff/testfiles/h5diff_612.txt b/tools/test/h5diff/testfiles/h5diff_612.txt
index a44d94a..4cccece 100644
--- a/tools/test/h5diff/testfiles/h5diff_612.txt
+++ b/tools/test/h5diff/testfiles/h5diff_612.txt
@@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            HDF5 file specified
    --vol-info-2            VOL-specific info to pass to the VOL connector used for
                            opening the second HDF5 file specified
+                           If none of the above options are used to specify a VOL for a file, then
+                           the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,
+                           if that environment variable is unset) will be used
    --vfd-value-1           Value (ID) of the VFL driver to use for opening the
                            first HDF5 file specified
    --vfd-name-1            Name of the VFL driver to use for opening the first
diff --git a/tools/test/h5diff/testfiles/h5diff_615.txt b/tools/test/h5diff/testfiles/h5diff_615.txt
index 5dc9cd3..3641164 100644
--- a/tools/test/h5diff/testfiles/h5diff_615.txt
+++ b/tools/test/h5diff/testfiles/h5diff_615.txt
@@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            HDF5 file specified
    --vol-info-2            VOL-specific info to pass to the VOL connector used for
                            opening the second HDF5 file specified
+                           If none of the above options are used to specify a VOL for a file, then
+                           the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,
+                           if that environment variable is unset) will be used
    --vfd-value-1           Value (ID) of the VFL driver to use for opening the
                            first HDF5 file specified
    --vfd-name-1            Name of the VFL driver to use for opening the first
diff --git a/tools/test/h5diff/testfiles/h5diff_621.txt b/tools/test/h5diff/testfiles/h5diff_621.txt
index d7998b5..05b952c 100644
--- a/tools/test/h5diff/testfiles/h5diff_621.txt
+++ b/tools/test/h5diff/testfiles/h5diff_621.txt
@@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            HDF5 file specified
    --vol-info-2            VOL-specific info to pass to the VOL connector used for
                            opening the second HDF5 file specified
+                           If none of the above options are used to specify a VOL for a file, then
+                           the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,
+                           if that environment variable is unset) will be used
    --vfd-value-1           Value (ID) of the VFL driver to use for opening the
                            first HDF5 file specified
    --vfd-name-1            Name of the VFL driver to use for opening the first
diff --git a/tools/test/h5diff/testfiles/h5diff_622.txt b/tools/test/h5diff/testfiles/h5diff_622.txt
index badfddd..4d3e945 100644
--- a/tools/test/h5diff/testfiles/h5diff_622.txt
+++ b/tools/test/h5diff/testfiles/h5diff_622.txt
@@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            HDF5 file specified
    --vol-info-2            VOL-specific info to pass to the VOL connector used for
                            opening the second HDF5 file specified
+                           If none of the above options are used to specify a VOL for a file, then
+                           the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,
+                           if that environment variable is unset) will be used
    --vfd-value-1           Value (ID) of the VFL driver to use for opening the
                            first HDF5 file specified
    --vfd-name-1            Name of the VFL driver to use for opening the first
diff --git a/tools/test/h5diff/testfiles/h5diff_623.txt b/tools/test/h5diff/testfiles/h5diff_623.txt
index 6ddd3da..fd992ef 100644
--- a/tools/test/h5diff/testfiles/h5diff_623.txt
+++ b/tools/test/h5diff/testfiles/h5diff_623.txt
@@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            HDF5 file specified
    --vol-info-2            VOL-specific info to pass to the VOL connector used for
                            opening the second HDF5 file specified
+                           If none of the above options are used to specify a VOL for a file, then
+                           the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,
+                           if that environment variable is unset) will be used
    --vfd-value-1           Value (ID) of the VFL driver to use for opening the
                            first HDF5 file specified
    --vfd-name-1            Name of the VFL driver to use for opening the first
diff --git a/tools/test/h5diff/testfiles/h5diff_624.txt b/tools/test/h5diff/testfiles/h5diff_624.txt
index 083632a..cc9578f 100644
--- a/tools/test/h5diff/testfiles/h5diff_624.txt
+++ b/tools/test/h5diff/testfiles/h5diff_624.txt
@@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            HDF5 file specified
    --vol-info-2            VOL-specific info to pass to the VOL connector used for
                            opening the second HDF5 file specified
+                           If none of the above options are used to specify a VOL for a file, then
+                           the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,
+                           if that environment variable is unset) will be used
    --vfd-value-1           Value (ID) of the VFL driver to use for opening the
                            first HDF5 file specified
    --vfd-name-1            Name of the VFL driver to use for opening the first