Merge pull request #2532 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor to develop

* commit '785bd0975ba13c3033820d0fc809da963fcd54ca':
  Fixed h5diff command-line parameters to use 1 and 2 instead of src and dst.
  Added VOL command-line options to (p)h5diff, h5ls, h5dump, and h5mkgrp.

11 files changed, 127 insertions, 0 deletions

diff --git a/tools/test/h5diff/testfiles/h5diff_10.txt b/tools/test/h5diff/testfiles/h5diff_10.txt
index 11ad800..0a2fd12 100644
--- a/tools/test/h5diff/testfiles/h5diff_10.txt
+++ b/tools/test/h5diff/testfiles/h5diff_10.txt
@@ -25,6 +25,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Quiet mode. Do not produce output.
    --enable-error-stack
                    Prints messages from the HDF5 error stack as they occur.
+   --vol-value-1           Value (ID) of the VOL connector to use for opening the
+                           first HDF5 file specified
+   --vol-name-1            Name of the VOL connector to use for opening the first
+                           HDF5 file specified
+   --vol-info-1            VOL-specific info to pass to the VOL connector used for
+                           opening the first HDF5 file specified
+   --vol-value-2           Value (ID) of the VOL connector to use for opening the
+                           second HDF5 file specified
+   --vol-name-2            Name of the VOL connector to use for opening the second
+                           HDF5 file specified
+   --vol-info-2            VOL-specific info to pass to the VOL connector used for
+                           opening the second HDF5 file specified
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_600.txt b/tools/test/h5diff/testfiles/h5diff_600.txt
index 13d627c..55b8da7 100644
--- a/tools/test/h5diff/testfiles/h5diff_600.txt
+++ b/tools/test/h5diff/testfiles/h5diff_600.txt
@@ -25,6 +25,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Quiet mode. Do not produce output.
    --enable-error-stack
                    Prints messages from the HDF5 error stack as they occur.
+   --vol-value-1           Value (ID) of the VOL connector to use for opening the
+                           first HDF5 file specified
+   --vol-name-1            Name of the VOL connector to use for opening the first
+                           HDF5 file specified
+   --vol-info-1            VOL-specific info to pass to the VOL connector used for
+                           opening the first HDF5 file specified
+   --vol-value-2           Value (ID) of the VOL connector to use for opening the
+                           second HDF5 file specified
+   --vol-name-2            Name of the VOL connector to use for opening the second
+                           HDF5 file specified
+   --vol-info-2            VOL-specific info to pass to the VOL connector used for
+                           opening the second HDF5 file specified
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_603.txt b/tools/test/h5diff/testfiles/h5diff_603.txt
index 0d6b474..36cd0ef 100644
--- a/tools/test/h5diff/testfiles/h5diff_603.txt
+++ b/tools/test/h5diff/testfiles/h5diff_603.txt
@@ -26,6 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Quiet mode. Do not produce output.
    --enable-error-stack
                    Prints messages from the HDF5 error stack as they occur.
+   --vol-value-1           Value (ID) of the VOL connector to use for opening the
+                           first HDF5 file specified
+   --vol-name-1            Name of the VOL connector to use for opening the first
+                           HDF5 file specified
+   --vol-info-1            VOL-specific info to pass to the VOL connector used for
+                           opening the first HDF5 file specified
+   --vol-value-2           Value (ID) of the VOL connector to use for opening the
+                           second HDF5 file specified
+   --vol-name-2            Name of the VOL connector to use for opening the second
+                           HDF5 file specified
+   --vol-info-2            VOL-specific info to pass to the VOL connector used for
+                           opening the second HDF5 file specified
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_606.txt b/tools/test/h5diff/testfiles/h5diff_606.txt
index 94f44e8..c2e9ac1 100644
--- a/tools/test/h5diff/testfiles/h5diff_606.txt
+++ b/tools/test/h5diff/testfiles/h5diff_606.txt
@@ -26,6 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Quiet mode. Do not produce output.
    --enable-error-stack
                    Prints messages from the HDF5 error stack as they occur.
+   --vol-value-1           Value (ID) of the VOL connector to use for opening the
+                           first HDF5 file specified
+   --vol-name-1            Name of the VOL connector to use for opening the first
+                           HDF5 file specified
+   --vol-info-1            VOL-specific info to pass to the VOL connector used for
+                           opening the first HDF5 file specified
+   --vol-value-2           Value (ID) of the VOL connector to use for opening the
+                           second HDF5 file specified
+   --vol-name-2            Name of the VOL connector to use for opening the second
+                           HDF5 file specified
+   --vol-info-2            VOL-specific info to pass to the VOL connector used for
+                           opening the second HDF5 file specified
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_612.txt b/tools/test/h5diff/testfiles/h5diff_612.txt
index 7f83c64..2e09432 100644
--- a/tools/test/h5diff/testfiles/h5diff_612.txt
+++ b/tools/test/h5diff/testfiles/h5diff_612.txt
@@ -26,6 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Quiet mode. Do not produce output.
    --enable-error-stack
                    Prints messages from the HDF5 error stack as they occur.
+   --vol-value-1           Value (ID) of the VOL connector to use for opening the
+                           first HDF5 file specified
+   --vol-name-1            Name of the VOL connector to use for opening the first
+                           HDF5 file specified
+   --vol-info-1            VOL-specific info to pass to the VOL connector used for
+                           opening the first HDF5 file specified
+   --vol-value-2           Value (ID) of the VOL connector to use for opening the
+                           second HDF5 file specified
+   --vol-name-2            Name of the VOL connector to use for opening the second
+                           HDF5 file specified
+   --vol-info-2            VOL-specific info to pass to the VOL connector used for
+                           opening the second HDF5 file specified
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_615.txt b/tools/test/h5diff/testfiles/h5diff_615.txt
index 3cfe6b9..a07de54 100644
--- a/tools/test/h5diff/testfiles/h5diff_615.txt
+++ b/tools/test/h5diff/testfiles/h5diff_615.txt
@@ -26,6 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Quiet mode. Do not produce output.
    --enable-error-stack
                    Prints messages from the HDF5 error stack as they occur.
+   --vol-value-1           Value (ID) of the VOL connector to use for opening the
+                           first HDF5 file specified
+   --vol-name-1            Name of the VOL connector to use for opening the first
+                           HDF5 file specified
+   --vol-info-1            VOL-specific info to pass to the VOL connector used for
+                           opening the first HDF5 file specified
+   --vol-value-2           Value (ID) of the VOL connector to use for opening the
+                           second HDF5 file specified
+   --vol-name-2            Name of the VOL connector to use for opening the second
+                           HDF5 file specified
+   --vol-info-2            VOL-specific info to pass to the VOL connector used for
+                           opening the second HDF5 file specified
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_621.txt b/tools/test/h5diff/testfiles/h5diff_621.txt
index 9c34945..5f44dd7 100644
--- a/tools/test/h5diff/testfiles/h5diff_621.txt
+++ b/tools/test/h5diff/testfiles/h5diff_621.txt
@@ -26,6 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Quiet mode. Do not produce output.
    --enable-error-stack
                    Prints messages from the HDF5 error stack as they occur.
+   --vol-value-1           Value (ID) of the VOL connector to use for opening the
+                           first HDF5 file specified
+   --vol-name-1            Name of the VOL connector to use for opening the first
+                           HDF5 file specified
+   --vol-info-1            VOL-specific info to pass to the VOL connector used for
+                           opening the first HDF5 file specified
+   --vol-value-2           Value (ID) of the VOL connector to use for opening the
+                           second HDF5 file specified
+   --vol-name-2            Name of the VOL connector to use for opening the second
+                           HDF5 file specified
+   --vol-info-2            VOL-specific info to pass to the VOL connector used for
+                           opening the second HDF5 file specified
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_622.txt b/tools/test/h5diff/testfiles/h5diff_622.txt
index 2b2df2f..2e28a42 100644
--- a/tools/test/h5diff/testfiles/h5diff_622.txt
+++ b/tools/test/h5diff/testfiles/h5diff_622.txt
@@ -26,6 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Quiet mode. Do not produce output.
    --enable-error-stack
                    Prints messages from the HDF5 error stack as they occur.
+   --vol-value-1           Value (ID) of the VOL connector to use for opening the
+                           first HDF5 file specified
+   --vol-name-1            Name of the VOL connector to use for opening the first
+                           HDF5 file specified
+   --vol-info-1            VOL-specific info to pass to the VOL connector used for
+                           opening the first HDF5 file specified
+   --vol-value-2           Value (ID) of the VOL connector to use for opening the
+                           second HDF5 file specified
+   --vol-name-2            Name of the VOL connector to use for opening the second
+                           HDF5 file specified
+   --vol-info-2            VOL-specific info to pass to the VOL connector used for
+                           opening the second HDF5 file specified
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_623.txt b/tools/test/h5diff/testfiles/h5diff_623.txt
index 3e80438..21cb90a 100644
--- a/tools/test/h5diff/testfiles/h5diff_623.txt
+++ b/tools/test/h5diff/testfiles/h5diff_623.txt
@@ -26,6 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Quiet mode. Do not produce output.
    --enable-error-stack
                    Prints messages from the HDF5 error stack as they occur.
+   --vol-value-1           Value (ID) of the VOL connector to use for opening the
+                           first HDF5 file specified
+   --vol-name-1            Name of the VOL connector to use for opening the first
+                           HDF5 file specified
+   --vol-info-1            VOL-specific info to pass to the VOL connector used for
+                           opening the first HDF5 file specified
+   --vol-value-2           Value (ID) of the VOL connector to use for opening the
+                           second HDF5 file specified
+   --vol-name-2            Name of the VOL connector to use for opening the second
+                           HDF5 file specified
+   --vol-info-2            VOL-specific info to pass to the VOL connector used for
+                           opening the second HDF5 file specified
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_624.txt b/tools/test/h5diff/testfiles/h5diff_624.txt
index 7a2f585..92c98d9 100644
--- a/tools/test/h5diff/testfiles/h5diff_624.txt
+++ b/tools/test/h5diff/testfiles/h5diff_624.txt
@@ -26,6 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
          Quiet mode. Do not produce output.
    --enable-error-stack
                    Prints messages from the HDF5 error stack as they occur.
+   --vol-value-1           Value (ID) of the VOL connector to use for opening the
+                           first HDF5 file specified
+   --vol-name-1            Name of the VOL connector to use for opening the first
+                           HDF5 file specified
+   --vol-info-1            VOL-specific info to pass to the VOL connector used for
+                           opening the first HDF5 file specified
+   --vol-value-2           Value (ID) of the VOL connector to use for opening the
+                           second HDF5 file specified
+   --vol-name-2            Name of the VOL connector to use for opening the second
+                           HDF5 file specified
+   --vol-info-2            VOL-specific info to pass to the VOL connector used for
+                           opening the second HDF5 file specified
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/test/misc/testfiles/h5mkgrp_help.txt b/tools/test/misc/testfiles/h5mkgrp_help.txt
index ba130f6..9525230 100644
--- a/tools/test/misc/testfiles/h5mkgrp_help.txt
+++ b/tools/test/misc/testfiles/h5mkgrp_help.txt
@@ -5,3 +5,10 @@ usage: h5mkgrp [OPTIONS] FILE GROUP...
       -p, --parents      No error if existing, make parent groups as needed
       -v, --verbose      Print information about OBJECTS and OPTIONS
       -V, --version      Print version number and exit
+      --vol-value        Value (ID) of the VOL connector to use for opening the
+                         HDF5 file specified
+      --vol-name         Name of the VOL connector to use for opening the
+                         HDF5 file specified
+      --vol-info         VOL-specific info to pass to the VOL connector used for
+                         opening the HDF5 file specified
+