summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/h5diff/CMakeLists.txt34
-rw-r--r--tools/h5diff/Makefile.am2
-rw-r--r--tools/h5diff/Makefile.in2
-rw-r--r--tools/h5diff/h5diff_common.c207
-rw-r--r--tools/h5diff/h5diff_common.h2
-rw-r--r--tools/h5diff/h5diff_main.c2
-rw-r--r--tools/h5diff/testfiles/h5diff_10.txt175
-rw-r--r--tools/h5diff/testfiles/h5diff_600.txt175
-rw-r--r--tools/h5diff/testfiles/h5diff_603.txt175
-rw-r--r--tools/h5diff/testfiles/h5diff_606.txt175
-rw-r--r--tools/h5diff/testfiles/h5diff_612.txt175
-rw-r--r--tools/h5diff/testfiles/h5diff_615.txt175
-rw-r--r--tools/h5diff/testfiles/h5diff_621.txt175
-rw-r--r--tools/h5diff/testfiles/h5diff_622.txt175
-rw-r--r--tools/h5diff/testfiles/h5diff_623.txt175
-rw-r--r--tools/h5diff/testfiles/h5diff_624.txt175
-rw-r--r--tools/h5diff/testfiles/h5diff_640.txt4
-rw-r--r--tools/h5diff/testfiles/h5diff_641.txt4
-rw-r--r--tools/h5diff/testfiles/h5diff_642.txt4
-rw-r--r--tools/h5diff/testfiles/h5diff_643.txt4
-rw-r--r--tools/h5diff/testfiles/h5diff_644.txt4
-rw-r--r--tools/h5diff/testfiles/h5diff_645.txt4
-rw-r--r--tools/h5diff/testfiles/h5diff_646.txt4
-rwxr-xr-xtools/h5diff/testh5diff.sh21
24 files changed, 1083 insertions, 965 deletions
diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt
index c99f1a9..f0e0695 100644
--- a/tools/h5diff/CMakeLists.txt
+++ b/tools/h5diff/CMakeLists.txt
@@ -176,6 +176,13 @@ IF (BUILD_TESTING)
h5diff_627.txt
h5diff_628.txt
h5diff_629.txt
+ h5diff_640.txt
+ h5diff_641.txt
+ h5diff_642.txt
+ h5diff_643.txt
+ h5diff_644.txt
+ h5diff_645.txt
+ h5diff_646.txt
h5diff_70.txt
h5diff_700.txt
h5diff_701.txt
@@ -672,6 +679,20 @@ IF (BUILD_TESTING)
h5diff_628.out.err
h5diff_629.out
h5diff_629.out.err
+ h5diff_640.out
+ h5diff_640.out.err
+ h5diff_641.out
+ h5diff_641.out.err
+ h5diff_642.out
+ h5diff_642.out.err
+ h5diff_643.out
+ h5diff_643.out.err
+ h5diff_644.out
+ h5diff_644.out.err
+ h5diff_645.out
+ h5diff_645.out.err
+ h5diff_646.out
+ h5diff_646.out.err
h5diff_70.out
h5diff_70.out.err
h5diff_700.out
@@ -1208,6 +1229,19 @@ ADD_H5_TEST (h5diff_484 0 -v --exclude-path "/dset3" ${EXCLUDE_FILE1_1} ${EXCLUD
# ##############################################################################
ADD_H5_TEST (h5diff_530 0 -v ${COMP_VL_STRS_FILE} ${COMP_VL_STRS_FILE} /group /group_copy)
+# ##############################################################################
+# # Test mutually exclusive options
+# ##############################################################################
+#
+# Test with -d , -p and --use-system-epsilon.
+ADD_H5_TEST (h5diff_640 1 -v -d 5 -p 0.05 --use-system-epsilon ${FILE1} ${FILE2} /g1/dset3 /g1/dset4)
+ADD_H5_TEST (h5diff_641 1 -v -d 5 -p 0.05 ${FILE1} ${FILE2} /g1/dset3 /g1/dset4)
+ADD_H5_TEST (h5diff_642 1 -v -p 0.05 -d 5 ${FILE1} ${FILE2} /g1/dset3 /g1/dset4)
+ADD_H5_TEST (h5diff_643 1 -v -d 5 --use-system-epsilon ${FILE1} ${FILE2} /g1/dset3 /g1/dset4)
+ADD_H5_TEST (h5diff_644 1 -v --use-system-epsilon -d 5 ${FILE1} ${FILE2} /g1/dset3 /g1/dset4)
+ADD_H5_TEST (h5diff_645 1 -v -p 0.05 --use-system-epsilon ${FILE1} ${FILE2} /g1/dset3 /g1/dset4)
+ADD_H5_TEST (h5diff_646 1 -v --use-system-epsilon -p 0.05 ${FILE1} ${FILE2} /g1/dset3 /g1/dset4)
+
ENDIF (BUILD_TESTING)
diff --git a/tools/h5diff/Makefile.am b/tools/h5diff/Makefile.am
index 0b8816f..da4464b 100644
--- a/tools/h5diff/Makefile.am
+++ b/tools/h5diff/Makefile.am
@@ -55,7 +55,7 @@ LDADD=$(LIBH5TOOLS) $(LIBHDF5)
# Temporary files. *.h5 are generated by h5diff. They should
# be copied to the testfiles/ directory if update is required
-CHECK_CLEANFILES+=*.h5 expect_sorted actual_sorted
+CHECK_CLEANFILES+=*.h5 testfiles expect_sorted actual_sorted
include $(top_srcdir)/config/conclude.am
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 55d7802..196f2cd 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -403,7 +403,7 @@ TRACE = perl $(top_srcdir)/bin/trace
# Temporary files. *.h5 are generated by h5diff. They should
# be copied to the testfiles/ directory if update is required
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 expect_sorted \
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 testfiles expect_sorted \
actual_sorted
# Include src and tools/lib directories
diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c
index fd679d3..141e81d 100644
--- a/tools/h5diff/h5diff_common.c
+++ b/tools/h5diff/h5diff_common.c
@@ -46,6 +46,31 @@ static struct long_options l_opts[] = {
{ NULL, 0, '\0' }
};
+/*-------------------------------------------------------------------------
+ * Function: check_options
+ *
+ * Purpose: parse command line input
+ *
+ *-------------------------------------------------------------------------
+ */
+static check_options(diff_opt_t* options)
+{
+ /*--------------------------------------------------------------
+ * check for mutually exclusive options
+ *--------------------------------------------------------------*/
+
+ /* check between -d , -p, --use-system-epsilon.
+ * These options are mutually exclusive.
+ */
+ if ((options->d + options->p + options->use_system_epsilon) > 1)
+ {
+ printf("%s error: -d, -p and --use-system-epsilon options are mutually-exclusive;\n", PROGRAMNAME);
+ printf("use no more than one.\n");
+ printf("Try '-h' or '--help' option for more information or see the %s entry in the 'HDF5 Reference Manual'.\n", PROGRAMNAME);
+ h5diff_exit(EXIT_FAILURE);
+ }
+}
+
/*-------------------------------------------------------------------------
* Function: parse_command_line
@@ -231,14 +256,13 @@ void parse_command_line(int argc,
}
}
+ /* check options */
+ check_options(options);
+
/* if exclude-path option is used, keep the exclude path list */
if (options->exclude_path)
options->exclude = exclude_head;
- /* if use system epsilon, unset -p and -d option */
- if (options->use_system_epsilon)
- options->d = options->p = 0;
-
/* check for file names to be processed */
if (argc <= opt_ind || argv[ opt_ind + 1 ] == NULL)
{
@@ -424,97 +448,98 @@ check_d_input( const char *str )
void usage(void)
{
printf("usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] \n");
- printf(" file1 File name of the first HDF5 file\n");
- printf(" file2 File name of the second HDF5 file\n");
- printf(" [obj1] Name of an HDF5 object, in absolute path\n");
- printf(" [obj2] Name of an HDF5 object, in absolute path\n");
+ printf(" file1 File name of the first HDF5 file\n");
+ printf(" file2 File name of the second HDF5 file\n");
+ printf(" [obj1] Name of an HDF5 object, in absolute path\n");
+ printf(" [obj2] Name of an HDF5 object, in absolute path\n");
printf("\n");
printf(" OPTIONS\n");
- printf(" -h, --help Print a usage message and exit.\n");
- printf(" -V, --version Print version number and exit.\n");
- printf(" -r, --report Report mode. Print differences.\n");
- printf(" -v --verbose Verbose mode. Print differences information and list\n");
- printf(" of objects.\n");
- printf(" -vN --verbose=N Verbose mode with level. Print differences and list\n");
- printf(" of objects.\n");
- printf(" Level of detail depends on value of N:\n");
- printf(" 0 : Identical to '-v' or '--verbose'.\n");
- printf(" 1 : All level 0 information plus one-line attribute\n");
- printf(" status summary.\n");
- printf(" 2 : All level 1 information plus extended attribute\n");
- printf(" status report.\n");
- printf(" -q, --quiet Quiet mode. Do not produce output.\n");
- printf(" --follow-symlinks Follow symbolic links (soft links and external links)\n");
- printf(" and compare the links' target objects.\n");
- printf(" If symbolic link(s) with the same name exist in the\n");
- printf(" files being compared, then determine whether the \n");
- printf(" target of each link is an existing object (dataset,\n");
- printf(" group, or named datatype) or the link is a dangling\n");
- printf(" link (a soft or external link pointing to a target\n");
- printf(" object that does not yet exist).\n");
- printf(" - If both symbolic links are dangling links, they\n");
- printf(" are treated as being the same; by default, h5diff\n");
- printf(" returns an exit code of 0. If, however, \n");
- printf(" --no-dangling-links is used with --follow-symlinks,\n");
- printf(" this situation is treated as an error and h5diff \n");
- printf(" returns an exit code of 2.\n");
- printf(" - If only one of the two links is a dangling link,\n");
- printf(" they are treated as being different and h5diff \n");
- printf(" returns an exit code of 1. If, however, \n");
- printf(" --no-dangling-links is used with --follow-symlinks,\n");
- printf(" this situation is treated as an error and h5diff \n");
- printf(" returns an exit code of 2.\n");
- printf(" - If both symbolic links point to existing objects,\n");
- printf(" h5diff compares the two objects.\n");
- printf(" If any symbolic link specified in the call to h5diff\n");
- printf(" does not exist, h5diff treats it as an error and\n");
- printf(" returns an exit code of 2.\n");
- printf(" --no-dangling-links Must be used with --follow-symlinks option;\n");
- printf(" otherwise, h5diff shows error message and returns\n");
- printf(" an exit code of 2.\n");
- printf(" Check for any symbolic links (soft links or external\n");
- printf(" links) that do not resolve to an existing object\n");
- printf(" (dataset, group, or named datatype). If any\n");
- printf(" dangling link is found, this situation is treated as\n");
- printf(" an error and h5diff returns an exit code of 2.\n");
- printf(" -c, --compare List objects that are not comparable\n");
- printf(" -N, --nan Avoid NaNs detection\n");
- printf(" -n C, --count=C Print differences up to C number, C is a positive\n");
- printf(" integer.\n");
- printf(" -d D, --delta=D Print difference if (|a-b| > D), D is a positive\n");
- printf(" number.\n");
- printf(" -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive\n");
- printf(" number.\n");
- printf(" --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is\n");
- printf(" a system epsilon value.\n");
- printf(" If the system epsilon is not defined, the below\n");
- printf(" one of the following predefined values will be used:\n");
- printf(" FLT_EPSILON = 1.19209E-07 for floating-point type\n");
- printf(" DBL_EPSILON = 2.22045E-16 for double percision type\n");
- printf(" --exclude-path \"path\" Exclude the specified path to an object when\n");
- printf(" comparing files or groups. If a group is excluded,\n");
- printf(" all member objects will also be excluded.\n");
- printf(" The specified path is excluded wherever it occurs.\n");
- printf(" This flexibility enables the same option to exclude\n");
- printf(" either objects that exist only in one file or\n");
- printf(" common objects that are known to differ.\n");
+ printf(" -h, --help\n");
+ printf(" Print a usage message and exit.\n");
+ printf(" -V, --version\n");
+ printf(" Print version number and exit.\n");
+ printf(" -r, --report\n");
+ printf(" Report mode. Print differences.\n");
+ printf(" -v --verbose\n");
+ printf(" Verbose mode. Print differences information and list of objects.\n");
+ printf(" -vN --verbose=N\n");
+ printf(" Verbose mode with level. Print differences and list of objects.\n");
+ printf(" Level of detail depends on value of N:\n");
+ printf(" 0 : Identical to '-v' or '--verbose'.\n");
+ printf(" 1 : All level 0 information plus one-line attribute\n");
+ printf(" status summary.\n");
+ printf(" 2 : All level 1 information plus extended attribute\n");
+ printf(" status report.\n");
+ printf(" -q, --quiet\n");
+ printf(" Quiet mode. Do not produce output.\n");
+ printf(" --follow-symlinks\n");
+ printf(" Follow symbolic links (soft links and external links and compare the)\n");
+ printf(" links' target objects.\n");
+ printf(" If symbolic link(s) with the same name exist in the files being\n");
+ printf(" compared, then determine whether the target of each link is an existing\n");
+ printf(" object (dataset, group, or named datatype) or the link is a dangling\n");
+ printf(" link (a soft or external link pointing to a target object that does\n");
+ printf(" not yet exist).\n");
+ printf(" - If both symbolic links are dangling links, they are treated as being\n");
+ printf(" the same; by default, h5diff returns an exit code of 0.\n");
+ printf(" If, however, --no-dangling-links is used with --follow-symlinks,\n");
+ printf(" this situation is treated as an error and h5diff returns an\n");
+ printf(" exit code of 2.\n");
+ printf(" - If only one of the two links is a dangling link,they are treated as\n");
+ printf(" being different and h5diff returns an exit code of 1.\n");
+ printf(" If, however, --no-dangling-links is used with --follow-symlinks,\n");
+ printf(" this situation is treated as an error and h5diff returns an\n");
+ printf(" exit code of 2.\n");
+ printf(" - If both symbolic links point to existing objects, h5diff compares the\n");
+ printf(" two objects.\n");
+ printf(" If any symbolic link specified in the call to h5diff does not exist,\n");
+ printf(" h5diff treats it as an error and returns an exit code of 2.\n");
+ printf(" --no-dangling-links\n");
+ printf(" Must be used with --follow-symlinks option; otherwise, h5diff shows\n");
+ printf(" error message and returns an exit code of 2.\n");
+ printf(" Check for any symbolic links (soft links or external links) that do not\n");
+ printf(" resolve to an existing object (dataset, group, or named datatype).\n");
+ printf(" If any dangling link is found, this situation is treated as an error\n");
+ printf(" and h5diff returns an exit code of 2.\n");
+ printf(" -c, --compare\n");
+ printf(" List objects that are not comparable\n");
+ printf(" -N, --nan\n");
+ printf(" Avoid NaNs detection\n");
+ printf(" -n C, --count=C\n");
+ printf(" Print differences up to C. C must be a positive integer.\n");
+ printf(" -d D, --delta=D\n");
+ printf(" Print difference if (|a-b| > D). D must be a positive number.\n");
+ printf(" Can not use with '-p' or '--use-system-epsilon'.\n");
+ printf(" -p R, --relative=R\n");
+ printf(" Print difference if (|(a-b)/b| > R). R must be a positive number.\n");
+ printf(" Can not use with '-d' or '--use-system-epsilon'.\n");
+ printf(" --use-system-epsilon\n");
+ printf(" Print difference if (|a-b| > EPSILON), EPSILON is system defined value.\n");
+ printf(" If the system epsilon is not defined,one of the following predefined\n");
+ printf(" values will be used:\n");
+ printf(" FLT_EPSILON = 1.19209E-07 for floating-point type\n");
+ printf(" DBL_EPSILON = 2.22045E-16 for double precision type\n");
+ printf(" Can not use with '-p' or '-d'.\n");
+ printf(" --exclude-path \"path\" \n");
+ printf(" Exclude the specified path to an object when comparing files or groups.\n");
+ printf(" If a group is excluded, all member objects will also be excluded.\n");
+ printf(" The specified path is excluded wherever it occurs.\n");
+ printf(" This flexibility enables the same option to exclude either objects that\n");
+ printf(" exist only in one file or common objects that are known to differ.\n");
printf("\n");
- printf(" When comparing files, \"path\" is the absolute path to\n");
- printf(" the excluded object; when comparing groups, \"path\" is\n");
- printf(" similar to the relative path from the group to the\n");
- printf(" excluded object. This \"path\" can be taken from the\n");
- printf(" first section of the output of the --verbose option.\n");
- printf(" For example, if you are comparing the group /groupA\n");
- printf(" in two files and you want to exclude\n");
- printf(" /groupA/groupB/groupC in both files, the exclude\n");
- printf(" option would read as follows:\n");
- printf(" --exclude-path \"/groupB/groupC\"\n");
+ printf(" When comparing files, \"path\" is the absolute path to the excluded;\n");
+ printf(" object; when comparing groups, \"path\" is similar to the relative\n");
+ printf(" path from the group to the excluded object. This \"path\" can be\n");
+ printf(" taken from the first section of the output of the --verbose option.\n");
+ printf(" For example, if you are comparing the group /groupA in two files and\n");
+ printf(" you want to exclude /groupA/groupB/groupC in both files, the exclude\n");
+ printf(" option would read as follows:\n");
+ printf(" --exclude-path \"/groupB/groupC\"\n");
printf("\n");
- printf(" If there are multiple paths to an object, only the\n");
- printf(" specified path(s) will be excluded; the comparison\n");
- printf(" will include any path not explicitly excluded.\n");
- printf(" This option can be used repeatedly to exclude\n");
- printf(" multiple paths.\n");
+ printf(" If there are multiple paths to an object, only the specified path(s)\n");
+ printf(" will be excluded; the comparison will include any path not explicitly\n");
+ printf(" excluded.\n");
+ printf(" This option can be used repeatedly to exclude multiple paths.\n");
printf("\n");
printf(" Modes of output:\n");
diff --git a/tools/h5diff/h5diff_common.h b/tools/h5diff/h5diff_common.h
index 5a601df..c4035a6 100644
--- a/tools/h5diff/h5diff_common.h
+++ b/tools/h5diff/h5diff_common.h
@@ -17,6 +17,8 @@
#define H5DIFFCOMMON_H__
#include "h5tools.h"
+/* Name of tool */
+#define PROGRAMNAME "h5diff"
#ifdef __cplusplus
extern "C" {
diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c
index c1538a4..824c529 100644
--- a/tools/h5diff/h5diff_main.c
+++ b/tools/h5diff/h5diff_main.c
@@ -19,8 +19,6 @@
#include "h5diff_common.h"
#include "h5tools_utils.h"
-/* Name of tool */
-#define PROGRAMNAME "h5diff"
/*-------------------------------------------------------------------------
* Function: main
diff --git a/tools/h5diff/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt
index fd13a5c..a699f00 100644
--- a/tools/h5diff/testfiles/h5diff_10.txt
+++ b/tools/h5diff/testfiles/h5diff_10.txt
@@ -1,95 +1,96 @@
usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
- file1 File name of the first HDF5 file
- file2 File name of the second HDF5 file
- [obj1] Name of an HDF5 object, in absolute path
- [obj2] Name of an HDF5 object, in absolute path
+ file1 File name of the first HDF5 file
+ file2 File name of the second HDF5 file
+ [obj1] Name of an HDF5 object, in absolute path
+ [obj2] Name of an HDF5 object, in absolute path
OPTIONS
- -h, --help Print a usage message and exit.
- -V, --version Print version number and exit.
- -r, --report Report mode. Print differences.
- -v --verbose Verbose mode. Print differences information and list
- of objects.
- -vN --verbose=N Verbose mode with level. Print differences and list
- of objects.
- Level of detail depends on value of N:
- 0 : Identical to '-v' or '--verbose'.
- 1 : All level 0 information plus one-line attribute
- status summary.
- 2 : All level 1 information plus extended attribute
- status report.
- -q, --quiet Quiet mode. Do not produce output.
- --follow-symlinks Follow symbolic links (soft links and external links)
- and compare the links' target objects.
- If symbolic link(s) with the same name exist in the
- files being compared, then determine whether the
- target of each link is an existing object (dataset,
- group, or named datatype) or the link is a dangling
- link (a soft or external link pointing to a target
- object that does not yet exist).
- - If both symbolic links are dangling links, they
- are treated as being the same; by default, h5diff
- returns an exit code of 0. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If only one of the two links is a dangling link,
- they are treated as being different and h5diff
- returns an exit code of 1. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If both symbolic links point to existing objects,
- h5diff compares the two objects.
- If any symbolic link specified in the call to h5diff
- does not exist, h5diff treats it as an error and
- returns an exit code of 2.
- --no-dangling-links Must be used with --follow-symlinks option;
- otherwise, h5diff shows error message and returns
- an exit code of 2.
- Check for any symbolic links (soft links or external
- links) that do not resolve to an existing object
- (dataset, group, or named datatype). If any
- dangling link is found, this situation is treated as
- an error and h5diff returns an exit code of 2.
- -c, --compare List objects that are not comparable
- -N, --nan Avoid NaNs detection
- -n C, --count=C Print differences up to C number, C is a positive
- integer.
- -d D, --delta=D Print difference if (|a-b| > D), D is a positive
- number.
- -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive
- number.
- --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is
- a system epsilon value.
- If the system epsilon is not defined, the below
- one of the following predefined values will be used:
- FLT_EPSILON = 1.19209E-07 for floating-point type
- DBL_EPSILON = 2.22045E-16 for double percision type
- --exclude-path "path" Exclude the specified path to an object when
- comparing files or groups. If a group is excluded,
- all member objects will also be excluded.
- The specified path is excluded wherever it occurs.
- This flexibility enables the same option to exclude
- either objects that exist only in one file or
- common objects that are known to differ.
+ -h, --help
+ Print a usage message and exit.
+ -V, --version
+ Print version number and exit.
+ -r, --report
+ Report mode. Print differences.
+ -v --verbose
+ Verbose mode. Print differences information and list of objects.
+ -vN --verbose=N
+ Verbose mode with level. Print differences and list of objects.
+ Level of detail depends on value of N:
+ 0 : Identical to '-v' or '--verbose'.
+ 1 : All level 0 information plus one-line attribute
+ status summary.
+ 2 : All level 1 information plus extended attribute
+ status report.
+ -q, --quiet
+ Quiet mode. Do not produce output.
+ --follow-symlinks
+ Follow symbolic links (soft links and external links and compare the)
+ links' target objects.
+ If symbolic link(s) with the same name exist in the files being
+ compared, then determine whether the target of each link is an existing
+ object (dataset, group, or named datatype) or the link is a dangling
+ link (a soft or external link pointing to a target object that does
+ not yet exist).
+ - If both symbolic links are dangling links, they are treated as being
+ the same; by default, h5diff returns an exit code of 0.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If only one of the two links is a dangling link,they are treated as
+ being different and h5diff returns an exit code of 1.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If both symbolic links point to existing objects, h5diff compares the
+ two objects.
+ If any symbolic link specified in the call to h5diff does not exist,
+ h5diff treats it as an error and returns an exit code of 2.
+ --no-dangling-links
+ Must be used with --follow-symlinks option; otherwise, h5diff shows
+ error message and returns an exit code of 2.
+ Check for any symbolic links (soft links or external links) that do not
+ resolve to an existing object (dataset, group, or named datatype).
+ If any dangling link is found, this situation is treated as an error
+ and h5diff returns an exit code of 2.
+ -c, --compare
+ List objects that are not comparable
+ -N, --nan
+ Avoid NaNs detection
+ -n C, --count=C
+ Print differences up to C. C must be a positive integer.
+ -d D, --delta=D
+ Print difference if (|a-b| > D). D must be a positive number.
+ Can not use with '-p' or '--use-system-epsilon'.
+ -p R, --relative=R
+ Print difference if (|(a-b)/b| > R). R must be a positive number.
+ Can not use with '-d' or '--use-system-epsilon'.
+ --use-system-epsilon
+ Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+ If the system epsilon is not defined,one of the following predefined
+ values will be used:
+ FLT_EPSILON = 1.19209E-07 for floating-point type
+ DBL_EPSILON = 2.22045E-16 for double precision type
+ Can not use with '-p' or '-d'.
+ --exclude-path "path"
+ Exclude the specified path to an object when comparing files or groups.
+ If a group is excluded, all member objects will also be excluded.
+ The specified path is excluded wherever it occurs.
+ This flexibility enables the same option to exclude either objects that
+ exist only in one file or common objects that are known to differ.
- When comparing files, "path" is the absolute path to
- the excluded object; when comparing groups, "path" is
- similar to the relative path from the group to the
- excluded object. This "path" can be taken from the
- first section of the output of the --verbose option.
- For example, if you are comparing the group /groupA
- in two files and you want to exclude
- /groupA/groupB/groupC in both files, the exclude
- option would read as follows:
- --exclude-path "/groupB/groupC"
+ When comparing files, "path" is the absolute path to the excluded;
+ object; when comparing groups, "path" is similar to the relative
+ path from the group to the excluded object. This "path" can be
+ taken from the first section of the output of the --verbose option.
+ For example, if you are comparing the group /groupA in two files and
+ you want to exclude /groupA/groupB/groupC in both files, the exclude
+ option would read as follows:
+ --exclude-path "/groupB/groupC"
- If there are multiple paths to an object, only the
- specified path(s) will be excluded; the comparison
- will include any path not explicitly excluded.
- This option can be used repeatedly to exclude
- multiple paths.
+ If there are multiple paths to an object, only the specified path(s)
+ will be excluded; the comparison will include any path not explicitly
+ excluded.
+ This option can be used repeatedly to exclude multiple paths.
Modes of output:
Default mode: print the number of differences found and where they occured
diff --git a/tools/h5diff/testfiles/h5diff_600.txt b/tools/h5diff/testfiles/h5diff_600.txt
index ecf73d8..3c3ad9f 100644
--- a/tools/h5diff/testfiles/h5diff_600.txt
+++ b/tools/h5diff/testfiles/h5diff_600.txt
@@ -1,95 +1,96 @@
usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
- file1 File name of the first HDF5 file
- file2 File name of the second HDF5 file
- [obj1] Name of an HDF5 object, in absolute path
- [obj2] Name of an HDF5 object, in absolute path
+ file1 File name of the first HDF5 file
+ file2 File name of the second HDF5 file
+ [obj1] Name of an HDF5 object, in absolute path
+ [obj2] Name of an HDF5 object, in absolute path
OPTIONS
- -h, --help Print a usage message and exit.
- -V, --version Print version number and exit.
- -r, --report Report mode. Print differences.
- -v --verbose Verbose mode. Print differences information and list
- of objects.
- -vN --verbose=N Verbose mode with level. Print differences and list
- of objects.
- Level of detail depends on value of N:
- 0 : Identical to '-v' or '--verbose'.
- 1 : All level 0 information plus one-line attribute
- status summary.
- 2 : All level 1 information plus extended attribute
- status report.
- -q, --quiet Quiet mode. Do not produce output.
- --follow-symlinks Follow symbolic links (soft links and external links)
- and compare the links' target objects.
- If symbolic link(s) with the same name exist in the
- files being compared, then determine whether the
- target of each link is an existing object (dataset,
- group, or named datatype) or the link is a dangling
- link (a soft or external link pointing to a target
- object that does not yet exist).
- - If both symbolic links are dangling links, they
- are treated as being the same; by default, h5diff
- returns an exit code of 0. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If only one of the two links is a dangling link,
- they are treated as being different and h5diff
- returns an exit code of 1. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If both symbolic links point to existing objects,
- h5diff compares the two objects.
- If any symbolic link specified in the call to h5diff
- does not exist, h5diff treats it as an error and
- returns an exit code of 2.
- --no-dangling-links Must be used with --follow-symlinks option;
- otherwise, h5diff shows error message and returns
- an exit code of 2.
- Check for any symbolic links (soft links or external
- links) that do not resolve to an existing object
- (dataset, group, or named datatype). If any
- dangling link is found, this situation is treated as
- an error and h5diff returns an exit code of 2.
- -c, --compare List objects that are not comparable
- -N, --nan Avoid NaNs detection
- -n C, --count=C Print differences up to C number, C is a positive
- integer.
- -d D, --delta=D Print difference if (|a-b| > D), D is a positive
- number.
- -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive
- number.
- --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is
- a system epsilon value.
- If the system epsilon is not defined, the below
- one of the following predefined values will be used:
- FLT_EPSILON = 1.19209E-07 for floating-point type
- DBL_EPSILON = 2.22045E-16 for double percision type
- --exclude-path "path" Exclude the specified path to an object when
- comparing files or groups. If a group is excluded,
- all member objects will also be excluded.
- The specified path is excluded wherever it occurs.
- This flexibility enables the same option to exclude
- either objects that exist only in one file or
- common objects that are known to differ.
+ -h, --help
+ Print a usage message and exit.
+ -V, --version
+ Print version number and exit.
+ -r, --report
+ Report mode. Print differences.
+ -v --verbose
+ Verbose mode. Print differences information and list of objects.
+ -vN --verbose=N
+ Verbose mode with level. Print differences and list of objects.
+ Level of detail depends on value of N:
+ 0 : Identical to '-v' or '--verbose'.
+ 1 : All level 0 information plus one-line attribute
+ status summary.
+ 2 : All level 1 information plus extended attribute
+ status report.
+ -q, --quiet
+ Quiet mode. Do not produce output.
+ --follow-symlinks
+ Follow symbolic links (soft links and external links and compare the)
+ links' target objects.
+ If symbolic link(s) with the same name exist in the files being
+ compared, then determine whether the target of each link is an existing
+ object (dataset, group, or named datatype) or the link is a dangling
+ link (a soft or external link pointing to a target object that does
+ not yet exist).
+ - If both symbolic links are dangling links, they are treated as being
+ the same; by default, h5diff returns an exit code of 0.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If only one of the two links is a dangling link,they are treated as
+ being different and h5diff returns an exit code of 1.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If both symbolic links point to existing objects, h5diff compares the
+ two objects.
+ If any symbolic link specified in the call to h5diff does not exist,
+ h5diff treats it as an error and returns an exit code of 2.
+ --no-dangling-links
+ Must be used with --follow-symlinks option; otherwise, h5diff shows
+ error message and returns an exit code of 2.
+ Check for any symbolic links (soft links or external links) that do not
+ resolve to an existing object (dataset, group, or named datatype).
+ If any dangling link is found, this situation is treated as an error
+ and h5diff returns an exit code of 2.
+ -c, --compare
+ List objects that are not comparable
+ -N, --nan
+ Avoid NaNs detection
+ -n C, --count=C
+ Print differences up to C. C must be a positive integer.
+ -d D, --delta=D
+ Print difference if (|a-b| > D). D must be a positive number.
+ Can not use with '-p' or '--use-system-epsilon'.
+ -p R, --relative=R
+ Print difference if (|(a-b)/b| > R). R must be a positive number.
+ Can not use with '-d' or '--use-system-epsilon'.
+ --use-system-epsilon
+ Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+ If the system epsilon is not defined,one of the following predefined
+ values will be used:
+ FLT_EPSILON = 1.19209E-07 for floating-point type
+ DBL_EPSILON = 2.22045E-16 for double precision type
+ Can not use with '-p' or '-d'.
+ --exclude-path "path"
+ Exclude the specified path to an object when comparing files or groups.
+ If a group is excluded, all member objects will also be excluded.
+ The specified path is excluded wherever it occurs.
+ This flexibility enables the same option to exclude either objects that
+ exist only in one file or common objects that are known to differ.
- When comparing files, "path" is the absolute path to
- the excluded object; when comparing groups, "path" is
- similar to the relative path from the group to the
- excluded object. This "path" can be taken from the
- first section of the output of the --verbose option.
- For example, if you are comparing the group /groupA
- in two files and you want to exclude
- /groupA/groupB/groupC in both files, the exclude
- option would read as follows:
- --exclude-path "/groupB/groupC"
+ When comparing files, "path" is the absolute path to the excluded;
+ object; when comparing groups, "path" is similar to the relative
+ path from the group to the excluded object. This "path" can be
+ taken from the first section of the output of the --verbose option.
+ For example, if you are comparing the group /groupA in two files and
+ you want to exclude /groupA/groupB/groupC in both files, the exclude
+ option would read as follows:
+ --exclude-path "/groupB/groupC"
- If there are multiple paths to an object, only the
- specified path(s) will be excluded; the comparison
- will include any path not explicitly excluded.
- This option can be used repeatedly to exclude
- multiple paths.
+ If there are multiple paths to an object, only the specified path(s)
+ will be excluded; the comparison will include any path not explicitly
+ excluded.
+ This option can be used repeatedly to exclude multiple paths.
Modes of output:
Default mode: print the number of differences found and where they occured
diff --git a/tools/h5diff/testfiles/h5diff_603.txt b/tools/h5diff/testfiles/h5diff_603.txt
index 776c468..087764a 100644
--- a/tools/h5diff/testfiles/h5diff_603.txt
+++ b/tools/h5diff/testfiles/h5diff_603.txt
@@ -1,96 +1,97 @@
<-d -4> is not a valid option
usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
- file1 File name of the first HDF5 file
- file2 File name of the second HDF5 file
- [obj1] Name of an HDF5 object, in absolute path
- [obj2] Name of an HDF5 object, in absolute path
+ file1 File name of the first HDF5 file
+ file2 File name of the second HDF5 file
+ [obj1] Name of an HDF5 object, in absolute path
+ [obj2] Name of an HDF5 object, in absolute path
OPTIONS
- -h, --help Print a usage message and exit.
- -V, --version Print version number and exit.
- -r, --report Report mode. Print differences.
- -v --verbose Verbose mode. Print differences information and list
- of objects.
- -vN --verbose=N Verbose mode with level. Print differences and list
- of objects.
- Level of detail depends on value of N:
- 0 : Identical to '-v' or '--verbose'.
- 1 : All level 0 information plus one-line attribute
- status summary.
- 2 : All level 1 information plus extended attribute
- status report.
- -q, --quiet Quiet mode. Do not produce output.
- --follow-symlinks Follow symbolic links (soft links and external links)
- and compare the links' target objects.
- If symbolic link(s) with the same name exist in the
- files being compared, then determine whether the
- target of each link is an existing object (dataset,
- group, or named datatype) or the link is a dangling
- link (a soft or external link pointing to a target
- object that does not yet exist).
- - If both symbolic links are dangling links, they
- are treated as being the same; by default, h5diff
- returns an exit code of 0. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If only one of the two links is a dangling link,
- they are treated as being different and h5diff
- returns an exit code of 1. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If both symbolic links point to existing objects,
- h5diff compares the two objects.
- If any symbolic link specified in the call to h5diff
- does not exist, h5diff treats it as an error and
- returns an exit code of 2.
- --no-dangling-links Must be used with --follow-symlinks option;
- otherwise, h5diff shows error message and returns
- an exit code of 2.
- Check for any symbolic links (soft links or external
- links) that do not resolve to an existing object
- (dataset, group, or named datatype). If any
- dangling link is found, this situation is treated as
- an error and h5diff returns an exit code of 2.
- -c, --compare List objects that are not comparable
- -N, --nan Avoid NaNs detection
- -n C, --count=C Print differences up to C number, C is a positive
- integer.
- -d D, --delta=D Print difference if (|a-b| > D), D is a positive
- number.
- -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive
- number.
- --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is
- a system epsilon value.
- If the system epsilon is not defined, the below
- one of the following predefined values will be used:
- FLT_EPSILON = 1.19209E-07 for floating-point type
- DBL_EPSILON = 2.22045E-16 for double percision type
- --exclude-path "path" Exclude the specified path to an object when
- comparing files or groups. If a group is excluded,
- all member objects will also be excluded.
- The specified path is excluded wherever it occurs.
- This flexibility enables the same option to exclude
- either objects that exist only in one file or
- common objects that are known to differ.
+ -h, --help
+ Print a usage message and exit.
+ -V, --version
+ Print version number and exit.
+ -r, --report
+ Report mode. Print differences.
+ -v --verbose
+ Verbose mode. Print differences information and list of objects.
+ -vN --verbose=N
+ Verbose mode with level. Print differences and list of objects.
+ Level of detail depends on value of N:
+ 0 : Identical to '-v' or '--verbose'.
+ 1 : All level 0 information plus one-line attribute
+ status summary.
+ 2 : All level 1 information plus extended attribute
+ status report.
+ -q, --quiet
+ Quiet mode. Do not produce output.
+ --follow-symlinks
+ Follow symbolic links (soft links and external links and compare the)
+ links' target objects.
+ If symbolic link(s) with the same name exist in the files being
+ compared, then determine whether the target of each link is an existing
+ object (dataset, group, or named datatype) or the link is a dangling
+ link (a soft or external link pointing to a target object that does
+ not yet exist).
+ - If both symbolic links are dangling links, they are treated as being
+ the same; by default, h5diff returns an exit code of 0.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If only one of the two links is a dangling link,they are treated as
+ being different and h5diff returns an exit code of 1.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If both symbolic links point to existing objects, h5diff compares the
+ two objects.
+ If any symbolic link specified in the call to h5diff does not exist,
+ h5diff treats it as an error and returns an exit code of 2.
+ --no-dangling-links
+ Must be used with --follow-symlinks option; otherwise, h5diff shows
+ error message and returns an exit code of 2.
+ Check for any symbolic links (soft links or external links) that do not
+ resolve to an existing object (dataset, group, or named datatype).
+ If any dangling link is found, this situation is treated as an error
+ and h5diff returns an exit code of 2.
+ -c, --compare
+ List objects that are not comparable
+ -N, --nan
+ Avoid NaNs detection
+ -n C, --count=C
+ Print differences up to C. C must be a positive integer.
+ -d D, --delta=D
+ Print difference if (|a-b| > D). D must be a positive number.
+ Can not use with '-p' or '--use-system-epsilon'.
+ -p R, --relative=R
+ Print difference if (|(a-b)/b| > R). R must be a positive number.
+ Can not use with '-d' or '--use-system-epsilon'.
+ --use-system-epsilon
+ Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+ If the system epsilon is not defined,one of the following predefined
+ values will be used:
+ FLT_EPSILON = 1.19209E-07 for floating-point type
+ DBL_EPSILON = 2.22045E-16 for double precision type
+ Can not use with '-p' or '-d'.
+ --exclude-path "path"
+ Exclude the specified path to an object when comparing files or groups.
+ If a group is excluded, all member objects will also be excluded.
+ The specified path is excluded wherever it occurs.
+ This flexibility enables the same option to exclude either objects that
+ exist only in one file or common objects that are known to differ.
- When comparing files, "path" is the absolute path to
- the excluded object; when comparing groups, "path" is
- similar to the relative path from the group to the
- excluded object. This "path" can be taken from the
- first section of the output of the --verbose option.
- For example, if you are comparing the group /groupA
- in two files and you want to exclude
- /groupA/groupB/groupC in both files, the exclude
- option would read as follows:
- --exclude-path "/groupB/groupC"
+ When comparing files, "path" is the absolute path to the excluded;
+ object; when comparing groups, "path" is similar to the relative
+ path from the group to the excluded object. This "path" can be
+ taken from the first section of the output of the --verbose option.
+ For example, if you are comparing the group /groupA in two files and
+ you want to exclude /groupA/groupB/groupC in both files, the exclude
+ option would read as follows:
+ --exclude-path "/groupB/groupC"
- If there are multiple paths to an object, only the
- specified path(s) will be excluded; the comparison
- will include any path not explicitly excluded.
- This option can be used repeatedly to exclude
- multiple paths.
+ If there are multiple paths to an object, only the specified path(s)
+ will be excluded; the comparison will include any path not explicitly
+ excluded.
+ This option can be used repeatedly to exclude multiple paths.
Modes of output:
Default mode: print the number of differences found and where they occured
diff --git a/tools/h5diff/testfiles/h5diff_606.txt b/tools/h5diff/testfiles/h5diff_606.txt
index 762698d..c31a67e 100644
--- a/tools/h5diff/testfiles/h5diff_606.txt
+++ b/tools/h5diff/testfiles/h5diff_606.txt
@@ -1,96 +1,97 @@
<-d 0x1> is not a valid option
usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
- file1 File name of the first HDF5 file
- file2 File name of the second HDF5 file
- [obj1] Name of an HDF5 object, in absolute path
- [obj2] Name of an HDF5 object, in absolute path
+ file1 File name of the first HDF5 file
+ file2 File name of the second HDF5 file
+ [obj1] Name of an HDF5 object, in absolute path
+ [obj2] Name of an HDF5 object, in absolute path
OPTIONS
- -h, --help Print a usage message and exit.
- -V, --version Print version number and exit.
- -r, --report Report mode. Print differences.
- -v --verbose Verbose mode. Print differences information and list
- of objects.
- -vN --verbose=N Verbose mode with level. Print differences and list
- of objects.
- Level of detail depends on value of N:
- 0 : Identical to '-v' or '--verbose'.
- 1 : All level 0 information plus one-line attribute
- status summary.
- 2 : All level 1 information plus extended attribute
- status report.
- -q, --quiet Quiet mode. Do not produce output.
- --follow-symlinks Follow symbolic links (soft links and external links)
- and compare the links' target objects.
- If symbolic link(s) with the same name exist in the
- files being compared, then determine whether the
- target of each link is an existing object (dataset,
- group, or named datatype) or the link is a dangling
- link (a soft or external link pointing to a target
- object that does not yet exist).
- - If both symbolic links are dangling links, they
- are treated as being the same; by default, h5diff
- returns an exit code of 0. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If only one of the two links is a dangling link,
- they are treated as being different and h5diff
- returns an exit code of 1. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If both symbolic links point to existing objects,
- h5diff compares the two objects.
- If any symbolic link specified in the call to h5diff
- does not exist, h5diff treats it as an error and
- returns an exit code of 2.
- --no-dangling-links Must be used with --follow-symlinks option;
- otherwise, h5diff shows error message and returns
- an exit code of 2.
- Check for any symbolic links (soft links or external
- links) that do not resolve to an existing object
- (dataset, group, or named datatype). If any
- dangling link is found, this situation is treated as
- an error and h5diff returns an exit code of 2.
- -c, --compare List objects that are not comparable
- -N, --nan Avoid NaNs detection
- -n C, --count=C Print differences up to C number, C is a positive
- integer.
- -d D, --delta=D Print difference if (|a-b| > D), D is a positive
- number.
- -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive
- number.
- --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is
- a system epsilon value.
- If the system epsilon is not defined, the below
- one of the following predefined values will be used:
- FLT_EPSILON = 1.19209E-07 for floating-point type
- DBL_EPSILON = 2.22045E-16 for double percision type
- --exclude-path "path" Exclude the specified path to an object when
- comparing files or groups. If a group is excluded,
- all member objects will also be excluded.
- The specified path is excluded wherever it occurs.
- This flexibility enables the same option to exclude
- either objects that exist only in one file or
- common objects that are known to differ.
+ -h, --help
+ Print a usage message and exit.
+ -V, --version
+ Print version number and exit.
+ -r, --report
+ Report mode. Print differences.
+ -v --verbose
+ Verbose mode. Print differences information and list of objects.
+ -vN --verbose=N
+ Verbose mode with level. Print differences and list of objects.
+ Level of detail depends on value of N:
+ 0 : Identical to '-v' or '--verbose'.
+ 1 : All level 0 information plus one-line attribute
+ status summary.
+ 2 : All level 1 information plus extended attribute
+ status report.
+ -q, --quiet
+ Quiet mode. Do not produce output.
+ --follow-symlinks
+ Follow symbolic links (soft links and external links and compare the)
+ links' target objects.
+ If symbolic link(s) with the same name exist in the files being
+ compared, then determine whether the target of each link is an existing
+ object (dataset, group, or named datatype) or the link is a dangling
+ link (a soft or external link pointing to a target object that does
+ not yet exist).
+ - If both symbolic links are dangling links, they are treated as being
+ the same; by default, h5diff returns an exit code of 0.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If only one of the two links is a dangling link,they are treated as
+ being different and h5diff returns an exit code of 1.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If both symbolic links point to existing objects, h5diff compares the
+ two objects.
+ If any symbolic link specified in the call to h5diff does not exist,
+ h5diff treats it as an error and returns an exit code of 2.
+ --no-dangling-links
+ Must be used with --follow-symlinks option; otherwise, h5diff shows
+ error message and returns an exit code of 2.
+ Check for any symbolic links (soft links or external links) that do not
+ resolve to an existing object (dataset, group, or named datatype).
+ If any dangling link is found, this situation is treated as an error
+ and h5diff returns an exit code of 2.
+ -c, --compare
+ List objects that are not comparable
+ -N, --nan
+ Avoid NaNs detection
+ -n C, --count=C
+ Print differences up to C. C must be a positive integer.
+ -d D, --delta=D
+ Print difference if (|a-b| > D). D must be a positive number.
+ Can not use with '-p' or '--use-system-epsilon'.
+ -p R, --relative=R
+ Print difference if (|(a-b)/b| > R). R must be a positive number.
+ Can not use with '-d' or '--use-system-epsilon'.
+ --use-system-epsilon
+ Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+ If the system epsilon is not defined,one of the following predefined
+ values will be used:
+ FLT_EPSILON = 1.19209E-07 for floating-point type
+ DBL_EPSILON = 2.22045E-16 for double precision type
+ Can not use with '-p' or '-d'.
+ --exclude-path "path"
+ Exclude the specified path to an object when comparing files or groups.
+ If a group is excluded, all member objects will also be excluded.
+ The specified path is excluded wherever it occurs.
+ This flexibility enables the same option to exclude either objects that
+ exist only in one file or common objects that are known to differ.
- When comparing files, "path" is the absolute path to
- the excluded object; when comparing groups, "path" is
- similar to the relative path from the group to the
- excluded object. This "path" can be taken from the
- first section of the output of the --verbose option.
- For example, if you are comparing the group /groupA
- in two files and you want to exclude
- /groupA/groupB/groupC in both files, the exclude
- option would read as follows:
- --exclude-path "/groupB/groupC"
+ When comparing files, "path" is the absolute path to the excluded;
+ object; when comparing groups, "path" is similar to the relative
+ path from the group to the excluded object. This "path" can be
+ taken from the first section of the output of the --verbose option.
+ For example, if you are comparing the group /groupA in two files and
+ you want to exclude /groupA/groupB/groupC in both files, the exclude
+ option would read as follows:
+ --exclude-path "/groupB/groupC"
- If there are multiple paths to an object, only the
- specified path(s) will be excluded; the comparison
- will include any path not explicitly excluded.
- This option can be used repeatedly to exclude
- multiple paths.
+ If there are multiple paths to an object, only the specified path(s)
+ will be excluded; the comparison will include any path not explicitly
+ excluded.
+ This option can be used repeatedly to exclude multiple paths.
Modes of output:
Default mode: print the number of differences found and where they occured
diff --git a/tools/h5diff/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt
index c5b3464..05318bd 100644
--- a/tools/h5diff/testfiles/h5diff_612.txt
+++ b/tools/h5diff/testfiles/h5diff_612.txt
@@ -1,96 +1,97 @@
<-p -4> is not a valid option
usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
- file1 File name of the first HDF5 file
- file2 File name of the second HDF5 file
- [obj1] Name of an HDF5 object, in absolute path
- [obj2] Name of an HDF5 object, in absolute path
+ file1 File name of the first HDF5 file
+ file2 File name of the second HDF5 file
+ [obj1] Name of an HDF5 object, in absolute path
+ [obj2] Name of an HDF5 object, in absolute path
OPTIONS
- -h, --help Print a usage message and exit.
- -V, --version Print version number and exit.
- -r, --report Report mode. Print differences.
- -v --verbose Verbose mode. Print differences information and list
- of objects.
- -vN --verbose=N Verbose mode with level. Print differences and list
- of objects.
- Level of detail depends on value of N:
- 0 : Identical to '-v' or '--verbose'.
- 1 : All level 0 information plus one-line attribute
- status summary.
- 2 : All level 1 information plus extended attribute
- status report.
- -q, --quiet Quiet mode. Do not produce output.
- --follow-symlinks Follow symbolic links (soft links and external links)
- and compare the links' target objects.
- If symbolic link(s) with the same name exist in the
- files being compared, then determine whether the
- target of each link is an existing object (dataset,
- group, or named datatype) or the link is a dangling
- link (a soft or external link pointing to a target
- object that does not yet exist).
- - If both symbolic links are dangling links, they
- are treated as being the same; by default, h5diff
- returns an exit code of 0. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If only one of the two links is a dangling link,
- they are treated as being different and h5diff
- returns an exit code of 1. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If both symbolic links point to existing objects,
- h5diff compares the two objects.
- If any symbolic link specified in the call to h5diff
- does not exist, h5diff treats it as an error and
- returns an exit code of 2.
- --no-dangling-links Must be used with --follow-symlinks option;
- otherwise, h5diff shows error message and returns
- an exit code of 2.
- Check for any symbolic links (soft links or external
- links) that do not resolve to an existing object
- (dataset, group, or named datatype). If any
- dangling link is found, this situation is treated as
- an error and h5diff returns an exit code of 2.
- -c, --compare List objects that are not comparable
- -N, --nan Avoid NaNs detection
- -n C, --count=C Print differences up to C number, C is a positive
- integer.
- -d D, --delta=D Print difference if (|a-b| > D), D is a positive
- number.
- -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive
- number.
- --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is
- a system epsilon value.
- If the system epsilon is not defined, the below
- one of the following predefined values will be used:
- FLT_EPSILON = 1.19209E-07 for floating-point type
- DBL_EPSILON = 2.22045E-16 for double percision type
- --exclude-path "path" Exclude the specified path to an object when
- comparing files or groups. If a group is excluded,
- all member objects will also be excluded.
- The specified path is excluded wherever it occurs.
- This flexibility enables the same option to exclude
- either objects that exist only in one file or
- common objects that are known to differ.
+ -h, --help
+ Print a usage message and exit.
+ -V, --version
+ Print version number and exit.
+ -r, --report
+ Report mode. Print differences.
+ -v --verbose
+ Verbose mode. Print differences information and list of objects.
+ -vN --verbose=N
+ Verbose mode with level. Print differences and list of objects.
+ Level of detail depends on value of N:
+ 0 : Identical to '-v' or '--verbose'.
+ 1 : All level 0 information plus one-line attribute
+ status summary.
+ 2 : All level 1 information plus extended attribute
+ status report.
+ -q, --quiet
+ Quiet mode. Do not produce output.
+ --follow-symlinks
+ Follow symbolic links (soft links and external links and compare the)
+ links' target objects.
+ If symbolic link(s) with the same name exist in the files being
+ compared, then determine whether the target of each link is an existing
+ object (dataset, group, or named datatype) or the link is a dangling
+ link (a soft or external link pointing to a target object that does
+ not yet exist).
+ - If both symbolic links are dangling links, they are treated as being
+ the same; by default, h5diff returns an exit code of 0.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If only one of the two links is a dangling link,they are treated as
+ being different and h5diff returns an exit code of 1.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If both symbolic links point to existing objects, h5diff compares the
+ two objects.
+ If any symbolic link specified in the call to h5diff does not exist,
+ h5diff treats it as an error and returns an exit code of 2.
+ --no-dangling-links
+ Must be used with --follow-symlinks option; otherwise, h5diff shows
+ error message and returns an exit code of 2.
+ Check for any symbolic links (soft links or external links) that do not
+ resolve to an existing object (dataset, group, or named datatype).
+ If any dangling link is found, this situation is treated as an error
+ and h5diff returns an exit code of 2.
+ -c, --compare
+ List objects that are not comparable
+ -N, --nan
+ Avoid NaNs detection
+ -n C, --count=C
+ Print differences up to C. C must be a positive integer.
+ -d D, --delta=D
+ Print difference if (|a-b| > D). D must be a positive number.
+ Can not use with '-p' or '--use-system-epsilon'.
+ -p R, --relative=R
+ Print difference if (|(a-b)/b| > R). R must be a positive number.
+ Can not use with '-d' or '--use-system-epsilon'.
+ --use-system-epsilon
+ Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+ If the system epsilon is not defined,one of the following predefined
+ values will be used:
+ FLT_EPSILON = 1.19209E-07 for floating-point type
+ DBL_EPSILON = 2.22045E-16 for double precision type
+ Can not use with '-p' or '-d'.
+ --exclude-path "path"
+ Exclude the specified path to an object when comparing files or groups.
+ If a group is excluded, all member objects will also be excluded.
+ The specified path is excluded wherever it occurs.
+ This flexibility enables the same option to exclude either objects that
+ exist only in one file or common objects that are known to differ.
- When comparing files, "path" is the absolute path to
- the excluded object; when comparing groups, "path" is
- similar to the relative path from the group to the
- excluded object. This "path" can be taken from the
- first section of the output of the --verbose option.
- For example, if you are comparing the group /groupA
- in two files and you want to exclude
- /groupA/groupB/groupC in both files, the exclude
- option would read as follows:
- --exclude-path "/groupB/groupC"
+ When comparing files, "path" is the absolute path to the excluded;
+ object; when comparing groups, "path" is similar to the relative
+ path from the group to the excluded object. This "path" can be
+ taken from the first section of the output of the --verbose option.
+ For example, if you are comparing the group /groupA in two files and
+ you want to exclude /groupA/groupB/groupC in both files, the exclude
+ option would read as follows:
+ --exclude-path "/groupB/groupC"
- If there are multiple paths to an object, only the
- specified path(s) will be excluded; the comparison
- will include any path not explicitly excluded.
- This option can be used repeatedly to exclude
- multiple paths.
+ If there are multiple paths to an object, only the specified path(s)
+ will be excluded; the comparison will include any path not explicitly
+ excluded.
+ This option can be used repeatedly to exclude multiple paths.
Modes of output:
Default mode: print the number of differences found and where they occured
diff --git a/tools/h5diff/testfiles/h5diff_615.txt b/tools/h5diff/testfiles/h5diff_615.txt
index 58d5c70..fd756b3 100644
--- a/tools/h5diff/testfiles/h5diff_615.txt
+++ b/tools/h5diff/testfiles/h5diff_615.txt
@@ -1,96 +1,97 @@
<-p 0x1> is not a valid option
usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
- file1 File name of the first HDF5 file
- file2 File name of the second HDF5 file
- [obj1] Name of an HDF5 object, in absolute path
- [obj2] Name of an HDF5 object, in absolute path
+ file1 File name of the first HDF5 file
+ file2 File name of the second HDF5 file
+ [obj1] Name of an HDF5 object, in absolute path
+ [obj2] Name of an HDF5 object, in absolute path
OPTIONS
- -h, --help Print a usage message and exit.
- -V, --version Print version number and exit.
- -r, --report Report mode. Print differences.
- -v --verbose Verbose mode. Print differences information and list
- of objects.
- -vN --verbose=N Verbose mode with level. Print differences and list
- of objects.
- Level of detail depends on value of N:
- 0 : Identical to '-v' or '--verbose'.
- 1 : All level 0 information plus one-line attribute
- status summary.
- 2 : All level 1 information plus extended attribute
- status report.
- -q, --quiet Quiet mode. Do not produce output.
- --follow-symlinks Follow symbolic links (soft links and external links)
- and compare the links' target objects.
- If symbolic link(s) with the same name exist in the
- files being compared, then determine whether the
- target of each link is an existing object (dataset,
- group, or named datatype) or the link is a dangling
- link (a soft or external link pointing to a target
- object that does not yet exist).
- - If both symbolic links are dangling links, they
- are treated as being the same; by default, h5diff
- returns an exit code of 0. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If only one of the two links is a dangling link,
- they are treated as being different and h5diff
- returns an exit code of 1. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If both symbolic links point to existing objects,
- h5diff compares the two objects.
- If any symbolic link specified in the call to h5diff
- does not exist, h5diff treats it as an error and
- returns an exit code of 2.
- --no-dangling-links Must be used with --follow-symlinks option;
- otherwise, h5diff shows error message and returns
- an exit code of 2.
- Check for any symbolic links (soft links or external
- links) that do not resolve to an existing object
- (dataset, group, or named datatype). If any
- dangling link is found, this situation is treated as
- an error and h5diff returns an exit code of 2.
- -c, --compare List objects that are not comparable
- -N, --nan Avoid NaNs detection
- -n C, --count=C Print differences up to C number, C is a positive
- integer.
- -d D, --delta=D Print difference if (|a-b| > D), D is a positive
- number.
- -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive
- number.
- --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is
- a system epsilon value.
- If the system epsilon is not defined, the below
- one of the following predefined values will be used:
- FLT_EPSILON = 1.19209E-07 for floating-point type
- DBL_EPSILON = 2.22045E-16 for double percision type
- --exclude-path "path" Exclude the specified path to an object when
- comparing files or groups. If a group is excluded,
- all member objects will also be excluded.
- The specified path is excluded wherever it occurs.
- This flexibility enables the same option to exclude
- either objects that exist only in one file or
- common objects that are known to differ.
+ -h, --help
+ Print a usage message and exit.
+ -V, --version
+ Print version number and exit.
+ -r, --report
+ Report mode. Print differences.
+ -v --verbose
+ Verbose mode. Print differences information and list of objects.
+ -vN --verbose=N
+ Verbose mode with level. Print differences and list of objects.
+ Level of detail depends on value of N:
+ 0 : Identical to '-v' or '--verbose'.
+ 1 : All level 0 information plus one-line attribute
+ status summary.
+ 2 : All level 1 information plus extended attribute
+ status report.
+ -q, --quiet
+ Quiet mode. Do not produce output.
+ --follow-symlinks
+ Follow symbolic links (soft links and external links and compare the)
+ links' target objects.
+ If symbolic link(s) with the same name exist in the files being
+ compared, then determine whether the target of each link is an existing
+ object (dataset, group, or named datatype) or the link is a dangling
+ link (a soft or external link pointing to a target object that does
+ not yet exist).
+ - If both symbolic links are dangling links, they are treated as being
+ the same; by default, h5diff returns an exit code of 0.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If only one of the two links is a dangling link,they are treated as
+ being different and h5diff returns an exit code of 1.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If both symbolic links point to existing objects, h5diff compares the
+ two objects.
+ If any symbolic link specified in the call to h5diff does not exist,
+ h5diff treats it as an error and returns an exit code of 2.
+ --no-dangling-links
+ Must be used with --follow-symlinks option; otherwise, h5diff shows
+ error message and returns an exit code of 2.
+ Check for any symbolic links (soft links or external links) that do not
+ resolve to an existing object (dataset, group, or named datatype).
+ If any dangling link is found, this situation is treated as an error
+ and h5diff returns an exit code of 2.
+ -c, --compare
+ List objects that are not comparable
+ -N, --nan
+ Avoid NaNs detection
+ -n C, --count=C
+ Print differences up to C. C must be a positive integer.
+ -d D, --delta=D
+ Print difference if (|a-b| > D). D must be a positive number.
+ Can not use with '-p' or '--use-system-epsilon'.
+ -p R, --relative=R
+ Print difference if (|(a-b)/b| > R). R must be a positive number.
+ Can not use with '-d' or '--use-system-epsilon'.
+ --use-system-epsilon
+ Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+ If the system epsilon is not defined,one of the following predefined
+ values will be used:
+ FLT_EPSILON = 1.19209E-07 for floating-point type
+ DBL_EPSILON = 2.22045E-16 for double precision type
+ Can not use with '-p' or '-d'.
+ --exclude-path "path"
+ Exclude the specified path to an object when comparing files or groups.
+ If a group is excluded, all member objects will also be excluded.
+ The specified path is excluded wherever it occurs.
+ This flexibility enables the same option to exclude either objects that
+ exist only in one file or common objects that are known to differ.
- When comparing files, "path" is the absolute path to
- the excluded object; when comparing groups, "path" is
- similar to the relative path from the group to the
- excluded object. This "path" can be taken from the
- first section of the output of the --verbose option.
- For example, if you are comparing the group /groupA
- in two files and you want to exclude
- /groupA/groupB/groupC in both files, the exclude
- option would read as follows:
- --exclude-path "/groupB/groupC"
+ When comparing files, "path" is the absolute path to the excluded;
+ object; when comparing groups, "path" is similar to the relative
+ path from the group to the excluded object. This "path" can be
+ taken from the first section of the output of the --verbose option.
+ For example, if you are comparing the group /groupA in two files and
+ you want to exclude /groupA/groupB/groupC in both files, the exclude
+ option would read as follows:
+ --exclude-path "/groupB/groupC"
- If there are multiple paths to an object, only the
- specified path(s) will be excluded; the comparison
- will include any path not explicitly excluded.
- This option can be used repeatedly to exclude
- multiple paths.
+ If there are multiple paths to an object, only the specified path(s)
+ will be excluded; the comparison will include any path not explicitly
+ excluded.
+ This option can be used repeatedly to exclude multiple paths.
Modes of output:
Default mode: print the number of differences found and where they occured
diff --git a/tools/h5diff/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt
index 1c8f745..fd8c680 100644
--- a/tools/h5diff/testfiles/h5diff_621.txt
+++ b/tools/h5diff/testfiles/h5diff_621.txt
@@ -1,96 +1,97 @@
<-n -4> is not a valid option
usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
- file1 File name of the first HDF5 file
- file2 File name of the second HDF5 file
- [obj1] Name of an HDF5 object, in absolute path
- [obj2] Name of an HDF5 object, in absolute path
+ file1 File name of the first HDF5 file
+ file2 File name of the second HDF5 file
+ [obj1] Name of an HDF5 object, in absolute path
+ [obj2] Name of an HDF5 object, in absolute path
OPTIONS
- -h, --help Print a usage message and exit.
- -V, --version Print version number and exit.
- -r, --report Report mode. Print differences.
- -v --verbose Verbose mode. Print differences information and list
- of objects.
- -vN --verbose=N Verbose mode with level. Print differences and list
- of objects.
- Level of detail depends on value of N:
- 0 : Identical to '-v' or '--verbose'.
- 1 : All level 0 information plus one-line attribute
- status summary.
- 2 : All level 1 information plus extended attribute
- status report.
- -q, --quiet Quiet mode. Do not produce output.
- --follow-symlinks Follow symbolic links (soft links and external links)
- and compare the links' target objects.
- If symbolic link(s) with the same name exist in the
- files being compared, then determine whether the
- target of each link is an existing object (dataset,
- group, or named datatype) or the link is a dangling
- link (a soft or external link pointing to a target
- object that does not yet exist).
- - If both symbolic links are dangling links, they
- are treated as being the same; by default, h5diff
- returns an exit code of 0. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If only one of the two links is a dangling link,
- they are treated as being different and h5diff
- returns an exit code of 1. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If both symbolic links point to existing objects,
- h5diff compares the two objects.
- If any symbolic link specified in the call to h5diff
- does not exist, h5diff treats it as an error and
- returns an exit code of 2.
- --no-dangling-links Must be used with --follow-symlinks option;
- otherwise, h5diff shows error message and returns
- an exit code of 2.
- Check for any symbolic links (soft links or external
- links) that do not resolve to an existing object
- (dataset, group, or named datatype). If any
- dangling link is found, this situation is treated as
- an error and h5diff returns an exit code of 2.
- -c, --compare List objects that are not comparable
- -N, --nan Avoid NaNs detection
- -n C, --count=C Print differences up to C number, C is a positive
- integer.
- -d D, --delta=D Print difference if (|a-b| > D), D is a positive
- number.
- -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive
- number.
- --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is
- a system epsilon value.
- If the system epsilon is not defined, the below
- one of the following predefined values will be used:
- FLT_EPSILON = 1.19209E-07 for floating-point type
- DBL_EPSILON = 2.22045E-16 for double percision type
- --exclude-path "path" Exclude the specified path to an object when
- comparing files or groups. If a group is excluded,
- all member objects will also be excluded.
- The specified path is excluded wherever it occurs.
- This flexibility enables the same option to exclude
- either objects that exist only in one file or
- common objects that are known to differ.
+ -h, --help
+ Print a usage message and exit.
+ -V, --version
+ Print version number and exit.
+ -r, --report
+ Report mode. Print differences.
+ -v --verbose
+ Verbose mode. Print differences information and list of objects.
+ -vN --verbose=N
+ Verbose mode with level. Print differences and list of objects.
+ Level of detail depends on value of N:
+ 0 : Identical to '-v' or '--verbose'.
+ 1 : All level 0 information plus one-line attribute
+ status summary.
+ 2 : All level 1 information plus extended attribute
+ status report.
+ -q, --quiet
+ Quiet mode. Do not produce output.
+ --follow-symlinks
+ Follow symbolic links (soft links and external links and compare the)
+ links' target objects.
+ If symbolic link(s) with the same name exist in the files being
+ compared, then determine whether the target of each link is an existing
+ object (dataset, group, or named datatype) or the link is a dangling
+ link (a soft or external link pointing to a target object that does
+ not yet exist).
+ - If both symbolic links are dangling links, they are treated as being
+ the same; by default, h5diff returns an exit code of 0.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If only one of the two links is a dangling link,they are treated as
+ being different and h5diff returns an exit code of 1.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If both symbolic links point to existing objects, h5diff compares the
+ two objects.
+ If any symbolic link specified in the call to h5diff does not exist,
+ h5diff treats it as an error and returns an exit code of 2.
+ --no-dangling-links
+ Must be used with --follow-symlinks option; otherwise, h5diff shows
+ error message and returns an exit code of 2.
+ Check for any symbolic links (soft links or external links) that do not
+ resolve to an existing object (dataset, group, or named datatype).
+ If any dangling link is found, this situation is treated as an error
+ and h5diff returns an exit code of 2.
+ -c, --compare
+ List objects that are not comparable
+ -N, --nan
+ Avoid NaNs detection
+ -n C, --count=C
+ Print differences up to C. C must be a positive integer.
+ -d D, --delta=D
+ Print difference if (|a-b| > D). D must be a positive number.
+ Can not use with '-p' or '--use-system-epsilon'.
+ -p R, --relative=R
+ Print difference if (|(a-b)/b| > R). R must be a positive number.
+ Can not use with '-d' or '--use-system-epsilon'.
+ --use-system-epsilon
+ Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+ If the system epsilon is not defined,one of the following predefined
+ values will be used:
+ FLT_EPSILON = 1.19209E-07 for floating-point type
+ DBL_EPSILON = 2.22045E-16 for double precision type
+ Can not use with '-p' or '-d'.
+ --exclude-path "path"
+ Exclude the specified path to an object when comparing files or groups.
+ If a group is excluded, all member objects will also be excluded.
+ The specified path is excluded wherever it occurs.
+ This flexibility enables the same option to exclude either objects that
+ exist only in one file or common objects that are known to differ.
- When comparing files, "path" is the absolute path to
- the excluded object; when comparing groups, "path" is
- similar to the relative path from the group to the
- excluded object. This "path" can be taken from the
- first section of the output of the --verbose option.
- For example, if you are comparing the group /groupA
- in two files and you want to exclude
- /groupA/groupB/groupC in both files, the exclude
- option would read as follows:
- --exclude-path "/groupB/groupC"
+ When comparing files, "path" is the absolute path to the excluded;
+ object; when comparing groups, "path" is similar to the relative
+ path from the group to the excluded object. This "path" can be
+ taken from the first section of the output of the --verbose option.
+ For example, if you are comparing the group /groupA in two files and
+ you want to exclude /groupA/groupB/groupC in both files, the exclude
+ option would read as follows:
+ --exclude-path "/groupB/groupC"
- If there are multiple paths to an object, only the
- specified path(s) will be excluded; the comparison
- will include any path not explicitly excluded.
- This option can be used repeatedly to exclude
- multiple paths.
+ If there are multiple paths to an object, only the specified path(s)
+ will be excluded; the comparison will include any path not explicitly
+ excluded.
+ This option can be used repeatedly to exclude multiple paths.
Modes of output:
Default mode: print the number of differences found and where they occured
diff --git a/tools/h5diff/testfiles/h5diff_622.txt b/tools/h5diff/testfiles/h5diff_622.txt
index 22f216f..f0d38af 100644
--- a/tools/h5diff/testfiles/h5diff_622.txt
+++ b/tools/h5diff/testfiles/h5diff_622.txt
@@ -1,96 +1,97 @@
<-n 0> is not a valid option
usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
- file1 File name of the first HDF5 file
- file2 File name of the second HDF5 file
- [obj1] Name of an HDF5 object, in absolute path
- [obj2] Name of an HDF5 object, in absolute path
+ file1 File name of the first HDF5 file
+ file2 File name of the second HDF5 file
+ [obj1] Name of an HDF5 object, in absolute path
+ [obj2] Name of an HDF5 object, in absolute path
OPTIONS
- -h, --help Print a usage message and exit.
- -V, --version Print version number and exit.
- -r, --report Report mode. Print differences.
- -v --verbose Verbose mode. Print differences information and list
- of objects.
- -vN --verbose=N Verbose mode with level. Print differences and list
- of objects.
- Level of detail depends on value of N:
- 0 : Identical to '-v' or '--verbose'.
- 1 : All level 0 information plus one-line attribute
- status summary.
- 2 : All level 1 information plus extended attribute
- status report.
- -q, --quiet Quiet mode. Do not produce output.
- --follow-symlinks Follow symbolic links (soft links and external links)
- and compare the links' target objects.
- If symbolic link(s) with the same name exist in the
- files being compared, then determine whether the
- target of each link is an existing object (dataset,
- group, or named datatype) or the link is a dangling
- link (a soft or external link pointing to a target
- object that does not yet exist).
- - If both symbolic links are dangling links, they
- are treated as being the same; by default, h5diff
- returns an exit code of 0. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If only one of the two links is a dangling link,
- they are treated as being different and h5diff
- returns an exit code of 1. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If both symbolic links point to existing objects,
- h5diff compares the two objects.
- If any symbolic link specified in the call to h5diff
- does not exist, h5diff treats it as an error and
- returns an exit code of 2.
- --no-dangling-links Must be used with --follow-symlinks option;
- otherwise, h5diff shows error message and returns
- an exit code of 2.
- Check for any symbolic links (soft links or external
- links) that do not resolve to an existing object
- (dataset, group, or named datatype). If any
- dangling link is found, this situation is treated as
- an error and h5diff returns an exit code of 2.
- -c, --compare List objects that are not comparable
- -N, --nan Avoid NaNs detection
- -n C, --count=C Print differences up to C number, C is a positive
- integer.
- -d D, --delta=D Print difference if (|a-b| > D), D is a positive
- number.
- -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive
- number.
- --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is
- a system epsilon value.
- If the system epsilon is not defined, the below
- one of the following predefined values will be used:
- FLT_EPSILON = 1.19209E-07 for floating-point type
- DBL_EPSILON = 2.22045E-16 for double percision type
- --exclude-path "path" Exclude the specified path to an object when
- comparing files or groups. If a group is excluded,
- all member objects will also be excluded.
- The specified path is excluded wherever it occurs.
- This flexibility enables the same option to exclude
- either objects that exist only in one file or
- common objects that are known to differ.
+ -h, --help
+ Print a usage message and exit.
+ -V, --version
+ Print version number and exit.
+ -r, --report
+ Report mode. Print differences.
+ -v --verbose
+ Verbose mode. Print differences information and list of objects.
+ -vN --verbose=N
+ Verbose mode with level. Print differences and list of objects.
+ Level of detail depends on value of N:
+ 0 : Identical to '-v' or '--verbose'.
+ 1 : All level 0 information plus one-line attribute
+ status summary.
+ 2 : All level 1 information plus extended attribute
+ status report.
+ -q, --quiet
+ Quiet mode. Do not produce output.
+ --follow-symlinks
+ Follow symbolic links (soft links and external links and compare the)
+ links' target objects.
+ If symbolic link(s) with the same name exist in the files being
+ compared, then determine whether the target of each link is an existing
+ object (dataset, group, or named datatype) or the link is a dangling
+ link (a soft or external link pointing to a target object that does
+ not yet exist).
+ - If both symbolic links are dangling links, they are treated as being
+ the same; by default, h5diff returns an exit code of 0.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If only one of the two links is a dangling link,they are treated as
+ being different and h5diff returns an exit code of 1.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If both symbolic links point to existing objects, h5diff compares the
+ two objects.
+ If any symbolic link specified in the call to h5diff does not exist,
+ h5diff treats it as an error and returns an exit code of 2.
+ --no-dangling-links
+ Must be used with --follow-symlinks option; otherwise, h5diff shows
+ error message and returns an exit code of 2.
+ Check for any symbolic links (soft links or external links) that do not
+ resolve to an existing object (dataset, group, or named datatype).
+ If any dangling link is found, this situation is treated as an error
+ and h5diff returns an exit code of 2.
+ -c, --compare
+ List objects that are not comparable
+ -N, --nan
+ Avoid NaNs detection
+ -n C, --count=C
+ Print differences up to C. C must be a positive integer.
+ -d D, --delta=D
+ Print difference if (|a-b| > D). D must be a positive number.
+ Can not use with '-p' or '--use-system-epsilon'.
+ -p R, --relative=R
+ Print difference if (|(a-b)/b| > R). R must be a positive number.
+ Can not use with '-d' or '--use-system-epsilon'.
+ --use-system-epsilon
+ Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+ If the system epsilon is not defined,one of the following predefined
+ values will be used:
+ FLT_EPSILON = 1.19209E-07 for floating-point type
+ DBL_EPSILON = 2.22045E-16 for double precision type
+ Can not use with '-p' or '-d'.
+ --exclude-path "path"
+ Exclude the specified path to an object when comparing files or groups.
+ If a group is excluded, all member objects will also be excluded.
+ The specified path is excluded wherever it occurs.
+ This flexibility enables the same option to exclude either objects that
+ exist only in one file or common objects that are known to differ.
- When comparing files, "path" is the absolute path to
- the excluded object; when comparing groups, "path" is
- similar to the relative path from the group to the
- excluded object. This "path" can be taken from the
- first section of the output of the --verbose option.
- For example, if you are comparing the group /groupA
- in two files and you want to exclude
- /groupA/groupB/groupC in both files, the exclude
- option would read as follows:
- --exclude-path "/groupB/groupC"
+ When comparing files, "path" is the absolute path to the excluded;
+ object; when comparing groups, "path" is similar to the relative
+ path from the group to the excluded object. This "path" can be
+ taken from the first section of the output of the --verbose option.
+ For example, if you are comparing the group /groupA in two files and
+ you want to exclude /groupA/groupB/groupC in both files, the exclude
+ option would read as follows:
+ --exclude-path "/groupB/groupC"
- If there are multiple paths to an object, only the
- specified path(s) will be excluded; the comparison
- will include any path not explicitly excluded.
- This option can be used repeatedly to exclude
- multiple paths.
+ If there are multiple paths to an object, only the specified path(s)
+ will be excluded; the comparison will include any path not explicitly
+ excluded.
+ This option can be used repeatedly to exclude multiple paths.
Modes of output:
Default mode: print the number of differences found and where they occured
diff --git a/tools/h5diff/testfiles/h5diff_623.txt b/tools/h5diff/testfiles/h5diff_623.txt
index 5dce69c..4ab66a5 100644
--- a/tools/h5diff/testfiles/h5diff_623.txt
+++ b/tools/h5diff/testfiles/h5diff_623.txt
@@ -1,96 +1,97 @@
<-n u> is not a valid option
usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
- file1 File name of the first HDF5 file
- file2 File name of the second HDF5 file
- [obj1] Name of an HDF5 object, in absolute path
- [obj2] Name of an HDF5 object, in absolute path
+ file1 File name of the first HDF5 file
+ file2 File name of the second HDF5 file
+ [obj1] Name of an HDF5 object, in absolute path
+ [obj2] Name of an HDF5 object, in absolute path
OPTIONS
- -h, --help Print a usage message and exit.
- -V, --version Print version number and exit.
- -r, --report Report mode. Print differences.
- -v --verbose Verbose mode. Print differences information and list
- of objects.
- -vN --verbose=N Verbose mode with level. Print differences and list
- of objects.
- Level of detail depends on value of N:
- 0 : Identical to '-v' or '--verbose'.
- 1 : All level 0 information plus one-line attribute
- status summary.
- 2 : All level 1 information plus extended attribute
- status report.
- -q, --quiet Quiet mode. Do not produce output.
- --follow-symlinks Follow symbolic links (soft links and external links)
- and compare the links' target objects.
- If symbolic link(s) with the same name exist in the
- files being compared, then determine whether the
- target of each link is an existing object (dataset,
- group, or named datatype) or the link is a dangling
- link (a soft or external link pointing to a target
- object that does not yet exist).
- - If both symbolic links are dangling links, they
- are treated as being the same; by default, h5diff
- returns an exit code of 0. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If only one of the two links is a dangling link,
- they are treated as being different and h5diff
- returns an exit code of 1. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If both symbolic links point to existing objects,
- h5diff compares the two objects.
- If any symbolic link specified in the call to h5diff
- does not exist, h5diff treats it as an error and
- returns an exit code of 2.
- --no-dangling-links Must be used with --follow-symlinks option;
- otherwise, h5diff shows error message and returns
- an exit code of 2.
- Check for any symbolic links (soft links or external
- links) that do not resolve to an existing object
- (dataset, group, or named datatype). If any
- dangling link is found, this situation is treated as
- an error and h5diff returns an exit code of 2.
- -c, --compare List objects that are not comparable
- -N, --nan Avoid NaNs detection
- -n C, --count=C Print differences up to C number, C is a positive
- integer.
- -d D, --delta=D Print difference if (|a-b| > D), D is a positive
- number.
- -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive
- number.
- --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is
- a system epsilon value.
- If the system epsilon is not defined, the below
- one of the following predefined values will be used:
- FLT_EPSILON = 1.19209E-07 for floating-point type
- DBL_EPSILON = 2.22045E-16 for double percision type
- --exclude-path "path" Exclude the specified path to an object when
- comparing files or groups. If a group is excluded,
- all member objects will also be excluded.
- The specified path is excluded wherever it occurs.
- This flexibility enables the same option to exclude
- either objects that exist only in one file or
- common objects that are known to differ.
+ -h, --help
+ Print a usage message and exit.
+ -V, --version
+ Print version number and exit.
+ -r, --report
+ Report mode. Print differences.
+ -v --verbose
+ Verbose mode. Print differences information and list of objects.
+ -vN --verbose=N
+ Verbose mode with level. Print differences and list of objects.
+ Level of detail depends on value of N:
+ 0 : Identical to '-v' or '--verbose'.
+ 1 : All level 0 information plus one-line attribute
+ status summary.
+ 2 : All level 1 information plus extended attribute
+ status report.
+ -q, --quiet
+ Quiet mode. Do not produce output.
+ --follow-symlinks
+ Follow symbolic links (soft links and external links and compare the)
+ links' target objects.
+ If symbolic link(s) with the same name exist in the files being
+ compared, then determine whether the target of each link is an existing
+ object (dataset, group, or named datatype) or the link is a dangling
+ link (a soft or external link pointing to a target object that does
+ not yet exist).
+ - If both symbolic links are dangling links, they are treated as being
+ the same; by default, h5diff returns an exit code of 0.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If only one of the two links is a dangling link,they are treated as
+ being different and h5diff returns an exit code of 1.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If both symbolic links point to existing objects, h5diff compares the
+ two objects.
+ If any symbolic link specified in the call to h5diff does not exist,
+ h5diff treats it as an error and returns an exit code of 2.
+ --no-dangling-links
+ Must be used with --follow-symlinks option; otherwise, h5diff shows
+ error message and returns an exit code of 2.
+ Check for any symbolic links (soft links or external links) that do not
+ resolve to an existing object (dataset, group, or named datatype).
+ If any dangling link is found, this situation is treated as an error
+ and h5diff returns an exit code of 2.
+ -c, --compare
+ List objects that are not comparable
+ -N, --nan
+ Avoid NaNs detection
+ -n C, --count=C
+ Print differences up to C. C must be a positive integer.
+ -d D, --delta=D
+ Print difference if (|a-b| > D). D must be a positive number.
+ Can not use with '-p' or '--use-system-epsilon'.
+ -p R, --relative=R
+ Print difference if (|(a-b)/b| > R). R must be a positive number.
+ Can not use with '-d' or '--use-system-epsilon'.
+ --use-system-epsilon
+ Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+ If the system epsilon is not defined,one of the following predefined
+ values will be used:
+ FLT_EPSILON = 1.19209E-07 for floating-point type
+ DBL_EPSILON = 2.22045E-16 for double precision type
+ Can not use with '-p' or '-d'.
+ --exclude-path "path"
+ Exclude the specified path to an object when comparing files or groups.
+ If a group is excluded, all member objects will also be excluded.
+ The specified path is excluded wherever it occurs.
+ This flexibility enables the same option to exclude either objects that
+ exist only in one file or common objects that are known to differ.
- When comparing files, "path" is the absolute path to
- the excluded object; when comparing groups, "path" is
- similar to the relative path from the group to the
- excluded object. This "path" can be taken from the
- first section of the output of the --verbose option.
- For example, if you are comparing the group /groupA
- in two files and you want to exclude
- /groupA/groupB/groupC in both files, the exclude
- option would read as follows:
- --exclude-path "/groupB/groupC"
+ When comparing files, "path" is the absolute path to the excluded;
+ object; when comparing groups, "path" is similar to the relative
+ path from the group to the excluded object. This "path" can be
+ taken from the first section of the output of the --verbose option.
+ For example, if you are comparing the group /groupA in two files and
+ you want to exclude /groupA/groupB/groupC in both files, the exclude
+ option would read as follows:
+ --exclude-path "/groupB/groupC"
- If there are multiple paths to an object, only the
- specified path(s) will be excluded; the comparison
- will include any path not explicitly excluded.
- This option can be used repeatedly to exclude
- multiple paths.
+ If there are multiple paths to an object, only the specified path(s)
+ will be excluded; the comparison will include any path not explicitly
+ excluded.
+ This option can be used repeatedly to exclude multiple paths.
Modes of output:
Default mode: print the number of differences found and where they occured
diff --git a/tools/h5diff/testfiles/h5diff_624.txt b/tools/h5diff/testfiles/h5diff_624.txt
index 863e422..f5e7ee3 100644
--- a/tools/h5diff/testfiles/h5diff_624.txt
+++ b/tools/h5diff/testfiles/h5diff_624.txt
@@ -1,96 +1,97 @@
<-n 0x1> is not a valid option
usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
- file1 File name of the first HDF5 file
- file2 File name of the second HDF5 file
- [obj1] Name of an HDF5 object, in absolute path
- [obj2] Name of an HDF5 object, in absolute path
+ file1 File name of the first HDF5 file
+ file2 File name of the second HDF5 file
+ [obj1] Name of an HDF5 object, in absolute path
+ [obj2] Name of an HDF5 object, in absolute path
OPTIONS
- -h, --help Print a usage message and exit.
- -V, --version Print version number and exit.
- -r, --report Report mode. Print differences.
- -v --verbose Verbose mode. Print differences information and list
- of objects.
- -vN --verbose=N Verbose mode with level. Print differences and list
- of objects.
- Level of detail depends on value of N:
- 0 : Identical to '-v' or '--verbose'.
- 1 : All level 0 information plus one-line attribute
- status summary.
- 2 : All level 1 information plus extended attribute
- status report.
- -q, --quiet Quiet mode. Do not produce output.
- --follow-symlinks Follow symbolic links (soft links and external links)
- and compare the links' target objects.
- If symbolic link(s) with the same name exist in the
- files being compared, then determine whether the
- target of each link is an existing object (dataset,
- group, or named datatype) or the link is a dangling
- link (a soft or external link pointing to a target
- object that does not yet exist).
- - If both symbolic links are dangling links, they
- are treated as being the same; by default, h5diff
- returns an exit code of 0. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If only one of the two links is a dangling link,
- they are treated as being different and h5diff
- returns an exit code of 1. If, however,
- --no-dangling-links is used with --follow-symlinks,
- this situation is treated as an error and h5diff
- returns an exit code of 2.
- - If both symbolic links point to existing objects,
- h5diff compares the two objects.
- If any symbolic link specified in the call to h5diff
- does not exist, h5diff treats it as an error and
- returns an exit code of 2.
- --no-dangling-links Must be used with --follow-symlinks option;
- otherwise, h5diff shows error message and returns
- an exit code of 2.
- Check for any symbolic links (soft links or external
- links) that do not resolve to an existing object
- (dataset, group, or named datatype). If any
- dangling link is found, this situation is treated as
- an error and h5diff returns an exit code of 2.
- -c, --compare List objects that are not comparable
- -N, --nan Avoid NaNs detection
- -n C, --count=C Print differences up to C number, C is a positive
- integer.
- -d D, --delta=D Print difference if (|a-b| > D), D is a positive
- number.
- -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive
- number.
- --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is
- a system epsilon value.
- If the system epsilon is not defined, the below
- one of the following predefined values will be used:
- FLT_EPSILON = 1.19209E-07 for floating-point type
- DBL_EPSILON = 2.22045E-16 for double percision type
- --exclude-path "path" Exclude the specified path to an object when
- comparing files or groups. If a group is excluded,
- all member objects will also be excluded.
- The specified path is excluded wherever it occurs.
- This flexibility enables the same option to exclude
- either objects that exist only in one file or
- common objects that are known to differ.
+ -h, --help
+ Print a usage message and exit.
+ -V, --version
+ Print version number and exit.
+ -r, --report
+ Report mode. Print differences.
+ -v --verbose
+ Verbose mode. Print differences information and list of objects.
+ -vN --verbose=N
+ Verbose mode with level. Print differences and list of objects.
+ Level of detail depends on value of N:
+ 0 : Identical to '-v' or '--verbose'.
+ 1 : All level 0 information plus one-line attribute
+ status summary.
+ 2 : All level 1 information plus extended attribute
+ status report.
+ -q, --quiet
+ Quiet mode. Do not produce output.
+ --follow-symlinks
+ Follow symbolic links (soft links and external links and compare the)
+ links' target objects.
+ If symbolic link(s) with the same name exist in the files being
+ compared, then determine whether the target of each link is an existing
+ object (dataset, group, or named datatype) or the link is a dangling
+ link (a soft or external link pointing to a target object that does
+ not yet exist).
+ - If both symbolic links are dangling links, they are treated as being
+ the same; by default, h5diff returns an exit code of 0.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If only one of the two links is a dangling link,they are treated as
+ being different and h5diff returns an exit code of 1.
+ If, however, --no-dangling-links is used with --follow-symlinks,
+ this situation is treated as an error and h5diff returns an
+ exit code of 2.
+ - If both symbolic links point to existing objects, h5diff compares the
+ two objects.
+ If any symbolic link specified in the call to h5diff does not exist,
+ h5diff treats it as an error and returns an exit code of 2.
+ --no-dangling-links
+ Must be used with --follow-symlinks option; otherwise, h5diff shows
+ error message and returns an exit code of 2.
+ Check for any symbolic links (soft links or external links) that do not
+ resolve to an existing object (dataset, group, or named datatype).
+ If any dangling link is found, this situation is treated as an error
+ and h5diff returns an exit code of 2.
+ -c, --compare
+ List objects that are not comparable
+ -N, --nan
+ Avoid NaNs detection
+ -n C, --count=C
+ Print differences up to C. C must be a positive integer.
+ -d D, --delta=D
+ Print difference if (|a-b| > D). D must be a positive number.
+ Can not use with '-p' or '--use-system-epsilon'.
+ -p R, --relative=R
+ Print difference if (|(a-b)/b| > R). R must be a positive number.
+ Can not use with '-d' or '--use-system-epsilon'.
+ --use-system-epsilon
+ Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+ If the system epsilon is not defined,one of the following predefined
+ values will be used:
+ FLT_EPSILON = 1.19209E-07 for floating-point type
+ DBL_EPSILON = 2.22045E-16 for double precision type
+ Can not use with '-p' or '-d'.
+ --exclude-path "path"
+ Exclude the specified path to an object when comparing files or groups.
+ If a group is excluded, all member objects will also be excluded.
+ The specified path is excluded wherever it occurs.
+ This flexibility enables the same option to exclude either objects that
+ exist only in one file or common objects that are known to differ.
- When comparing files, "path" is the absolute path to
- the excluded object; when comparing groups, "path" is
- similar to the relative path from the group to the
- excluded object. This "path" can be taken from the
- first section of the output of the --verbose option.
- For example, if you are comparing the group /groupA
- in two files and you want to exclude
- /groupA/groupB/groupC in both files, the exclude
- option would read as follows:
- --exclude-path "/groupB/groupC"
+ When comparing files, "path" is the absolute path to the excluded;
+ object; when comparing groups, "path" is similar to the relative
+ path from the group to the excluded object. This "path" can be
+ taken from the first section of the output of the --verbose option.
+ For example, if you are comparing the group /groupA in two files and
+ you want to exclude /groupA/groupB/groupC in both files, the exclude
+ option would read as follows:
+ --exclude-path "/groupB/groupC"
- If there are multiple paths to an object, only the
- specified path(s) will be excluded; the comparison
- will include any path not explicitly excluded.
- This option can be used repeatedly to exclude
- multiple paths.
+ If there are multiple paths to an object, only the specified path(s)
+ will be excluded; the comparison will include any path not explicitly
+ excluded.
+ This option can be used repeatedly to exclude multiple paths.
Modes of output:
Default mode: print the number of differences found and where they occured
diff --git a/tools/h5diff/testfiles/h5diff_640.txt b/tools/h5diff/testfiles/h5diff_640.txt
new file mode 100644
index 0000000..4c956a6
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_640.txt
@@ -0,0 +1,4 @@
+h5diff error: -d, -p and --use-system-epsilon options are mutually-exclusive;
+use no more than one.
+Try '-h' or '--help' option for more information or see the h5diff entry in the 'HDF5 Reference Manual'.
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_641.txt b/tools/h5diff/testfiles/h5diff_641.txt
new file mode 100644
index 0000000..4c956a6
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_641.txt
@@ -0,0 +1,4 @@
+h5diff error: -d, -p and --use-system-epsilon options are mutually-exclusive;
+use no more than one.
+Try '-h' or '--help' option for more information or see the h5diff entry in the 'HDF5 Reference Manual'.
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_642.txt b/tools/h5diff/testfiles/h5diff_642.txt
new file mode 100644
index 0000000..4c956a6
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_642.txt
@@ -0,0 +1,4 @@
+h5diff error: -d, -p and --use-system-epsilon options are mutually-exclusive;
+use no more than one.
+Try '-h' or '--help' option for more information or see the h5diff entry in the 'HDF5 Reference Manual'.
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_643.txt b/tools/h5diff/testfiles/h5diff_643.txt
new file mode 100644
index 0000000..4c956a6
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_643.txt
@@ -0,0 +1,4 @@
+h5diff error: -d, -p and --use-system-epsilon options are mutually-exclusive;
+use no more than one.
+Try '-h' or '--help' option for more information or see the h5diff entry in the 'HDF5 Reference Manual'.
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_644.txt b/tools/h5diff/testfiles/h5diff_644.txt
new file mode 100644
index 0000000..4c956a6
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_644.txt
@@ -0,0 +1,4 @@
+h5diff error: -d, -p and --use-system-epsilon options are mutually-exclusive;
+use no more than one.
+Try '-h' or '--help' option for more information or see the h5diff entry in the 'HDF5 Reference Manual'.
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_645.txt b/tools/h5diff/testfiles/h5diff_645.txt
new file mode 100644
index 0000000..4c956a6
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_645.txt
@@ -0,0 +1,4 @@
+h5diff error: -d, -p and --use-system-epsilon options are mutually-exclusive;
+use no more than one.
+Try '-h' or '--help' option for more information or see the h5diff entry in the 'HDF5 Reference Manual'.
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_646.txt b/tools/h5diff/testfiles/h5diff_646.txt
new file mode 100644
index 0000000..4c956a6
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_646.txt
@@ -0,0 +1,4 @@
+h5diff error: -d, -p and --use-system-epsilon options are mutually-exclusive;
+use no more than one.
+Try '-h' or '--help' option for more information or see the h5diff entry in the 'HDF5 Reference Manual'.
+EXIT CODE: 1
diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index 1b6ed5a..b33e691 100755
--- a/tools/h5diff/testh5diff.sh
+++ b/tools/h5diff/testh5diff.sh
@@ -254,6 +254,13 @@ $SRC_H5DIFF_TESTFILES/h5diff_626.txt
$SRC_H5DIFF_TESTFILES/h5diff_627.txt
$SRC_H5DIFF_TESTFILES/h5diff_628.txt
$SRC_H5DIFF_TESTFILES/h5diff_629.txt
+$SRC_H5DIFF_TESTFILES/h5diff_640.txt
+$SRC_H5DIFF_TESTFILES/h5diff_641.txt
+$SRC_H5DIFF_TESTFILES/h5diff_642.txt
+$SRC_H5DIFF_TESTFILES/h5diff_643.txt
+$SRC_H5DIFF_TESTFILES/h5diff_644.txt
+$SRC_H5DIFF_TESTFILES/h5diff_645.txt
+$SRC_H5DIFF_TESTFILES/h5diff_646.txt
$SRC_H5DIFF_TESTFILES/h5diff_70.txt
$SRC_H5DIFF_TESTFILES/h5diff_700.txt
$SRC_H5DIFF_TESTFILES/h5diff_701.txt
@@ -971,6 +978,20 @@ TOOLTEST h5diff_484.txt -v --exclude-path "/dset3" h5diff_exclude1-1.h5 h5diff_e
TOOLTEST h5diff_530.txt -v h5diff_comp_vl_strs.h5 h5diff_comp_vl_strs.h5 /group /group_copy
# ##############################################################################
+# # Test mutually exclusive options
+# ##############################################################################
+#
+# Test with -d , -p and --use-system-epsilon.
+TOOLTEST h5diff_640.txt -v -d 5 -p 0.05 --use-system-epsilon h5diff_basic1.h5 h5diff_basic2.h5 /g1/dset3 /g1/dset4
+TOOLTEST h5diff_641.txt -v -d 5 -p 0.05 h5diff_basic1.h5 h5diff_basic2.h5 /g1/dset3 /g1/dset4
+TOOLTEST h5diff_642.txt -v -p 0.05 -d 5 h5diff_basic1.h5 h5diff_basic2.h5 /g1/dset3 /g1/dset4
+TOOLTEST h5diff_643.txt -v -d 5 --use-system-epsilon h5diff_basic1.h5 h5diff_basic2.h5 /g1/dset3 /g1/dset4
+TOOLTEST h5diff_644.txt -v --use-system-epsilon -d 5 h5diff_basic1.h5 h5diff_basic2.h5 /g1/dset3 /g1/dset4
+TOOLTEST h5diff_645.txt -v -p 0.05 --use-system-epsilon h5diff_basic1.h5 h5diff_basic2.h5 /g1/dset3 /g1/dset4
+TOOLTEST h5diff_646.txt -v --use-system-epsilon -p 0.05 h5diff_basic1.h5 h5diff_basic2.h5 /g1/dset3 /g1/dset4
+
+
+# ##############################################################################
# # END
# ##############################################################################