diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2012-03-21 15:10:17 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-03-21 15:10:17 (GMT) |
commit | eb89d7b53ab95623ab454186a602e1cafc7391f0 (patch) | |
tree | ceafe458b3011e38853e765352d3c7e59bbecce1 /tools/h5diff/testfiles | |
parent | 3e468e6ff65d540a439e99ea568a6bff7add7cea (diff) | |
download | hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.zip hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.gz hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.bz2 |
[svn-r22105] Description:
Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously. The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.
Tested on:
Mac OSX/64 10.7.3 (amazon) w/debug
Diffstat (limited to 'tools/h5diff/testfiles')
59 files changed, 1100 insertions, 905 deletions
diff --git a/tools/h5diff/testfiles/compounds_array_vlen1.h5 b/tools/h5diff/testfiles/compounds_array_vlen1.h5 Binary files differnew file mode 100644 index 0000000..398026c --- /dev/null +++ b/tools/h5diff/testfiles/compounds_array_vlen1.h5 diff --git a/tools/h5diff/testfiles/compounds_array_vlen2.h5 b/tools/h5diff/testfiles/compounds_array_vlen2.h5 Binary files differnew file mode 100644 index 0000000..f6f0868 --- /dev/null +++ b/tools/h5diff/testfiles/compounds_array_vlen2.h5 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_17.txt b/tools/h5diff/testfiles/h5diff_17.txt index 5cb604d..4906a2a 100644 --- a/tools/h5diff/testfiles/h5diff_17.txt +++ b/tools/h5diff/testfiles/h5diff_17.txt @@ -22,9 +22,12 @@ file1 file2 x /g1/fp16 x /g1/fp17 x /g1/fp18 + x /g1/fp18_COPY x /g1/fp19 + x /g1/fp19_COPY x /g1/fp2 x /g1/fp20 + x /g1/fp20_COPY x /g1/ld x /g2 x /g2/dset1 diff --git a/tools/h5diff/testfiles/h5diff_171.txt b/tools/h5diff/testfiles/h5diff_171.txt index 5314a79..aabe16a 100644 --- a/tools/h5diff/testfiles/h5diff_171.txt +++ b/tools/h5diff/testfiles/h5diff_171.txt @@ -1,3 +1,3 @@ -dataset: </g1/fp19> and </g1/fp19> +dataset: </g1/fp19> and </g1/fp19_COPY> 0 differences found EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_172.txt b/tools/h5diff/testfiles/h5diff_172.txt index 0269194..852f7b5 100644 --- a/tools/h5diff/testfiles/h5diff_172.txt +++ b/tools/h5diff/testfiles/h5diff_172.txt @@ -1,3 +1,3 @@ -dataset: </g1/fp20> and </g1/fp20> +dataset: </g1/fp20> and </g1/fp20_COPY> 0 differences found EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_20.txt b/tools/h5diff/testfiles/h5diff_20.txt index 6eba851..3edb543 100644 --- a/tools/h5diff/testfiles/h5diff_20.txt +++ b/tools/h5diff/testfiles/h5diff_20.txt @@ -2,5 +2,5 @@ -------------------------------- Some objects are not comparable -------------------------------- -Use -c for a list of objects. +Use -c for a list of objects without details of differences. EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_202.txt b/tools/h5diff/testfiles/h5diff_202.txt index 53657d3..95ef1da 100644 --- a/tools/h5diff/testfiles/h5diff_202.txt +++ b/tools/h5diff/testfiles/h5diff_202.txt @@ -1,3 +1,2 @@ Not comparable: </g2/dset2> is of class H5T_FLOAT and </g2/dset3> is of class H5T_INTEGER -Not comparable: </g2/dset2> has sign H5T_SGN_ERROR and </g2/dset3> has sign H5T_SGN_2 EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_205.txt b/tools/h5diff/testfiles/h5diff_205.txt index d72797b..bf5650f 100644 --- a/tools/h5diff/testfiles/h5diff_205.txt +++ b/tools/h5diff/testfiles/h5diff_205.txt @@ -1,4 +1,3 @@ Not comparable: </g2/dset5> has rank 2, dimensions [2x2], max dimensions [2x2] and </g2/dset6> has rank 2, dimensions [3x2], max dimensions [3x2] -Not comparable: </g2/dset5> has sign H5T_SGN_2 and </g2/dset6> has sign H5T_SGN_NONE EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_208.txt b/tools/h5diff/testfiles/h5diff_208.txt new file mode 100644 index 0000000..783be90 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_208.txt @@ -0,0 +1,5 @@ +Not comparable: </dset1> or </dset1> is an empty dataset +Not comparable: </dset2> or </dset2> is an empty dataset +Not comparable: </dset2> has rank 2, dimensions [0x0], max dimensions [0x0] +and </dset2> has rank 2, dimensions [0x4], max dimensions [0x4] +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_21.txt b/tools/h5diff/testfiles/h5diff_21.txt index 238c8b8..1479457 100644 --- a/tools/h5diff/testfiles/h5diff_21.txt +++ b/tools/h5diff/testfiles/h5diff_21.txt @@ -2,5 +2,5 @@ -------------------------------- Some objects are not comparable -------------------------------- -Use -c for a list of objects. +Use -c for a list of objects without details of differences. EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_22.txt b/tools/h5diff/testfiles/h5diff_22.txt index 33c3a3d..3ccb06b 100644 --- a/tools/h5diff/testfiles/h5diff_22.txt +++ b/tools/h5diff/testfiles/h5diff_22.txt @@ -2,5 +2,5 @@ -------------------------------- Some objects are not comparable -------------------------------- -Use -c for a list of objects. +Use -c for a list of objects without details of differences. EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_220.txt b/tools/h5diff/testfiles/h5diff_220.txt new file mode 100644 index 0000000..cadbb6d --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_220.txt @@ -0,0 +1,8 @@ +Not comparable: </g1/dset1> is of class H5T_INTEGER and </g1/dset1> is of class H5T_STRING +attribute: <attr of </g1/dset1>> and <attr of </g1/dset1>> +3 differences found +dataset: </g1/dset1> and </g1/dset1> +3 differences found +dataset: </g1/dset2> and </g1/dset2> +3 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_221.txt b/tools/h5diff/testfiles/h5diff_221.txt new file mode 100644 index 0000000..621f5c3 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_221.txt @@ -0,0 +1,12 @@ +Not comparable: <attr1> is of class H5T_INTEGER and <attr1> is of class H5T_STRING +Not comparable: <attr2> has rank 1, dimensions [3], max dimensions [3] +and <attr2> has rank 1, dimensions [4], max dimensions [4] +Not comparable: <attr3> has rank 1, dimensions [3], max dimensions [3] +and <attr3> has rank 2, dimensions [3x1], max dimensions [3x1] +attribute: <attr4 of </g2/dset1>> and <attr4 of </g2/dset1>> +3 differences found +dataset: </g2/dset1> and </g2/dset1> +6 differences found +dataset: </g2/dset2> and </g2/dset2> +3 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_222.txt b/tools/h5diff/testfiles/h5diff_222.txt new file mode 100644 index 0000000..bdecb8a --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_222.txt @@ -0,0 +1,19 @@ +Not comparable: </g1/dset1> is of class H5T_INTEGER and </g1/dset1> is of class H5T_STRING +attribute: <attr of </g1/dset1>> and <attr of </g1/dset1>> +3 differences found +dataset: </g1/dset1> and </g1/dset1> +3 differences found +dataset: </g1/dset2> and </g1/dset2> +3 differences found +Not comparable: <attr1> is of class H5T_INTEGER and <attr1> is of class H5T_STRING +Not comparable: <attr2> has rank 1, dimensions [3], max dimensions [3] +and <attr2> has rank 1, dimensions [4], max dimensions [4] +Not comparable: <attr3> has rank 1, dimensions [3], max dimensions [3] +and <attr3> has rank 2, dimensions [3x1], max dimensions [3x1] +attribute: <attr4 of </g2/dset1>> and <attr4 of </g2/dset1>> +3 differences found +dataset: </g2/dset1> and </g2/dset1> +6 differences found +dataset: </g2/dset2> and </g2/dset2> +3 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_30.txt b/tools/h5diff/testfiles/h5diff_30.txt new file mode 100644 index 0000000..187589a --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_30.txt @@ -0,0 +1,9 @@ +dataset: </dset1> and </dset2> +size: [6] [6] +position dset1 dset2 difference +------------------------------------------------------------ +[ 1 ] YIN **INVALID VALUE** +[ 2 ] **INVALID VALUE** YIN +[ 5 ] YIN YANG +3 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_465.txt b/tools/h5diff/testfiles/h5diff_465.txt new file mode 100644 index 0000000..eca5994 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_465.txt @@ -0,0 +1 @@ +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_466.txt b/tools/h5diff/testfiles/h5diff_466.txt new file mode 100644 index 0000000..3e00ca3 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_466.txt @@ -0,0 +1,5 @@ +obj1 </soft_link1> is a dangling link. +obj2 </soft_link1> is a dangling link. +dangling link: </soft_link1> and </soft_link1> +0 differences found +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_467.txt b/tools/h5diff/testfiles/h5diff_467.txt new file mode 100644 index 0000000..f5195c0 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_467.txt @@ -0,0 +1,3 @@ +obj2 </soft_link2> is a dangling link. +1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_468.txt b/tools/h5diff/testfiles/h5diff_468.txt new file mode 100644 index 0000000..75b16c6 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_468.txt @@ -0,0 +1,5 @@ +obj1 </ext_link4> is a dangling link. +obj2 </ext_link4> is a dangling link. +dangling link: </ext_link4> and </ext_link4> +0 differences found +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_469.txt b/tools/h5diff/testfiles/h5diff_469.txt new file mode 100644 index 0000000..594fd80 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_469.txt @@ -0,0 +1,3 @@ +obj2 </ext_link2> is a dangling link. +1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_505.txt b/tools/h5diff/testfiles/h5diff_505.txt index 28640b7..a220730 100644 --- a/tools/h5diff/testfiles/h5diff_505.txt +++ b/tools/h5diff/testfiles/h5diff_505.txt @@ -2,5 +2,5 @@ -------------------------------- Some objects are not comparable -------------------------------- -Use -c for a list of objects. +Use -c for a list of objects without details of differences. EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_507.txt b/tools/h5diff/testfiles/h5diff_507.txt index ed2b799..6176f3f 100644 --- a/tools/h5diff/testfiles/h5diff_507.txt +++ b/tools/h5diff/testfiles/h5diff_507.txt @@ -2,5 +2,5 @@ -------------------------------- Some objects are not comparable -------------------------------- -Use -c for a list of objects. +Use -c for a list of objects without details of differences. EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_509.txt b/tools/h5diff/testfiles/h5diff_509.txt index 145cd9d..a51ab35 100644 --- a/tools/h5diff/testfiles/h5diff_509.txt +++ b/tools/h5diff/testfiles/h5diff_509.txt @@ -2,5 +2,5 @@ -------------------------------- Some objects are not comparable -------------------------------- -Use -c for a list of objects. +Use -c for a list of objects without details of differences. EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_530.txt b/tools/h5diff/testfiles/h5diff_530.txt index bd2b435..73d736e 100644 --- a/tools/h5diff/testfiles/h5diff_530.txt +++ b/tools/h5diff/testfiles/h5diff_530.txt @@ -1,7 +1,7 @@ -file1 file2 +group1 group2 --------------------------------------- - x x / + x x x x /Compound_dset1 x x /Compound_dset2 x x /Compound_dset3 @@ -12,24 +12,24 @@ file1 file2 x x /Compound_dset8 x x /Compound_dset9 -group : </> and </> +group : </group> and </group_copy> 0 differences found -dataset: </Compound_dset1> and </Compound_dset1> +dataset: </group/Compound_dset1> and </group_copy/Compound_dset1> 0 differences found -dataset: </Compound_dset2> and </Compound_dset2> +dataset: </group/Compound_dset2> and </group_copy/Compound_dset2> 0 differences found -dataset: </Compound_dset3> and </Compound_dset3> +dataset: </group/Compound_dset3> and </group_copy/Compound_dset3> 0 differences found -dataset: </Compound_dset4> and </Compound_dset4> +dataset: </group/Compound_dset4> and </group_copy/Compound_dset4> 0 differences found -dataset: </Compound_dset5> and </Compound_dset5> +dataset: </group/Compound_dset5> and </group_copy/Compound_dset5> 0 differences found -dataset: </Compound_dset6> and </Compound_dset6> +dataset: </group/Compound_dset6> and </group_copy/Compound_dset6> 0 differences found -dataset: </Compound_dset7> and </Compound_dset7> +dataset: </group/Compound_dset7> and </group_copy/Compound_dset7> 0 differences found -dataset: </Compound_dset8> and </Compound_dset8> +dataset: </group/Compound_dset8> and </group_copy/Compound_dset8> 0 differences found -dataset: </Compound_dset9> and </Compound_dset9> +dataset: </group/Compound_dset9> and </group_copy/Compound_dset9> 0 differences found EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_540.txt b/tools/h5diff/testfiles/h5diff_540.txt new file mode 100644 index 0000000..a6903c8 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_540.txt @@ -0,0 +1,86 @@ + +file1 file2 +--------------------------------------- + x x / + x x /dset1 + x x /dset2 + x x /dset3 + x x /dset4 + +group : </> and </> +0 differences found +attribute: <attr1 of </>> and <attr1 of </>> +size: [2] [2] +position attr1 of </> attr1 of </> difference +------------------------------------------------------------ +[ 0 ] 0 5 5 +[ 0 ] 0 5 5 +[ 0 ] 0 5 5 +[ 0 ] 0 5 5 +[ 1 ] 10 15 5 +[ 1 ] 10.5 15.5 5 +[ 1 ] 10 15 5 +[ 1 ] 10.5 15.5 5 +8 differences found +dataset: </dset1> and </dset1> +size: [2] [2] +position dset1 dset1 difference +------------------------------------------------------------ +[ 0 ] 0 5 5 +[ 0 ] 0 5 5 +[ 0 ] 0 5 5 +[ 0 ] 0 5 5 +[ 1 ] 10 15 5 +[ 1 ] 10.5 15.5 5 +[ 1 ] 10 15 5 +[ 1 ] 10.5 15.5 5 +8 differences found +dataset: </dset2> and </dset2> +size: [2] [2] +position dset2 dset2 difference +------------------------------------------------------------ +[ 0 ] 0 5 5 +[ 0 ] 0 5 5 +[ 1 ] 10 15 5 +[ 1 ] 10.5 15.5 5 +[ 1 ] 10 15 5 +[ 1 ] 10.5 15.5 5 +6 differences found +dataset: </dset3> and </dset3> +size: [2] [2] +position dset3 dset3 difference +------------------------------------------------------------ +[ 0 ] 0 5 5 +[ 0 ] 0 5 5 +[ 0 ] 10 15 5 +[ 0 ] 10.5 15.5 5 +[ 0 ] 10 15 5 +[ 0 ] 10.5 15.5 5 +[ 1 ] 0 5 5 +[ 1 ] 0 5 5 +[ 1 ] 10 15 5 +[ 1 ] 10.5 15.5 5 +[ 1 ] 10 15 5 +[ 1 ] 10.5 15.5 5 +12 differences found +dataset: </dset4> and </dset4> +size: [2] [2] +position dset4 dset4 difference +------------------------------------------------------------ +[ 0 ] 0 5 5 +[ 0 ] 0 5 5 +[ 0 ] 0 5 5 +[ 0 ] 10 15 5 +[ 0 ] 10.5 15.5 5 +[ 1 ] 10 15 5 +[ 1 ] 0 5 5 +[ 1 ] 0 5 5 +[ 1 ] 10 15 5 +[ 1 ] 10.5 15.5 5 +[ 1 ] 10 15 5 +[ 1 ] 0 5 5 +[ 1 ] 0 5 5 +[ 1 ] 10 15 5 +[ 1 ] 10.5 15.5 5 +15 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_57.txt b/tools/h5diff/testfiles/h5diff_57.txt index 61aaa57..d5125fe 100644 --- a/tools/h5diff/testfiles/h5diff_57.txt +++ b/tools/h5diff/testfiles/h5diff_57.txt @@ -7,5 +7,5 @@ Not comparable: </dset7a> has sign H5T_SGN_2 and </dset7b> has sign H5T_SGN_NONE -------------------------------- Some objects are not comparable -------------------------------- -Use -c for a list of objects. +Use -c for a list of objects without details of differences. EXIT CODE: 0 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_630.txt b/tools/h5diff/testfiles/h5diff_630.txt new file mode 100644 index 0000000..aaf0148 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_630.txt @@ -0,0 +1,3 @@ +dataset: </g1/fp18> and </g1/fp18_COPY> +0 differences found +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_631.txt b/tools/h5diff/testfiles/h5diff_631.txt new file mode 100644 index 0000000..aaf0148 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_631.txt @@ -0,0 +1,3 @@ +dataset: </g1/fp18> and </g1/fp18_COPY> +0 differences found +EXIT CODE: 0 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/testfiles/h5diff_70.txt b/tools/h5diff/testfiles/h5diff_70.txt index c6aeb68..47b057c 100644 --- a/tools/h5diff/testfiles/h5diff_70.txt +++ b/tools/h5diff/testfiles/h5diff_70.txt @@ -2028,5 +2028,5 @@ position vlen3D of </g1> vlen3D of </g1> difference -------------------------------- Some objects are not comparable -------------------------------- -Use -c for a list of objects. +Use -c for a list of objects without details of differences. EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_700.txt b/tools/h5diff/testfiles/h5diff_700.txt index 99398a9..00c5b07 100644 --- a/tools/h5diff/testfiles/h5diff_700.txt +++ b/tools/h5diff/testfiles/h5diff_700.txt @@ -2034,5 +2034,5 @@ position vlen3D of </g1> vlen3D of </g1> difference -------------------------------- Some objects are not comparable -------------------------------- -Use -c for a list of objects. +Use -c for a list of objects without details of differences. EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_701.txt b/tools/h5diff/testfiles/h5diff_701.txt index 3b3e5b6..a4b436f 100644 --- a/tools/h5diff/testfiles/h5diff_701.txt +++ b/tools/h5diff/testfiles/h5diff_701.txt @@ -2133,5 +2133,5 @@ position vlen3D of </g1> vlen3D of </g1> difference -------------------------------- Some objects are not comparable -------------------------------- -Use -c for a list of objects. +Use -c for a list of objects without details of differences. EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_702.txt b/tools/h5diff/testfiles/h5diff_702.txt index 99398a9..00c5b07 100644 --- a/tools/h5diff/testfiles/h5diff_702.txt +++ b/tools/h5diff/testfiles/h5diff_702.txt @@ -2034,5 +2034,5 @@ position vlen3D of </g1> vlen3D of </g1> difference -------------------------------- Some objects are not comparable -------------------------------- -Use -c for a list of objects. +Use -c for a list of objects without details of differences. EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_703.txt b/tools/h5diff/testfiles/h5diff_703.txt index 3b3e5b6..a4b436f 100644 --- a/tools/h5diff/testfiles/h5diff_703.txt +++ b/tools/h5diff/testfiles/h5diff_703.txt @@ -2133,5 +2133,5 @@ position vlen3D of </g1> vlen3D of </g1> difference -------------------------------- Some objects are not comparable -------------------------------- -Use -c for a list of objects. +Use -c for a list of objects without details of differences. EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_80.txt b/tools/h5diff/testfiles/h5diff_80.txt index 1c55b1a..5957d72 100644 --- a/tools/h5diff/testfiles/h5diff_80.txt +++ b/tools/h5diff/testfiles/h5diff_80.txt @@ -877,5 +877,5 @@ point #4 (2,8) (1,7) -------------------------------- Some objects are not comparable -------------------------------- -Use -c for a list of objects. +Use -c for a list of objects without details of differences. EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_90.txt b/tools/h5diff/testfiles/h5diff_90.txt index fb23843..9965ab0 100644 --- a/tools/h5diff/testfiles/h5diff_90.txt +++ b/tools/h5diff/testfiles/h5diff_90.txt @@ -30,7 +30,6 @@ dataset: </g1/dset4> and </g1/dset4> group : </g2> and </g2> 0 differences found dataset: </g2/dset1> and </g2/dset1> -Not comparable: </g2/dset1> or </g2/dset1> is an empty dataset 0 differences found dataset: </g2/dset2> and </g2/dset2> 0 differences found @@ -47,10 +46,5 @@ dataset: </g2/dset7> and </g2/dset7> dataset: </g2/dset8> and </g2/dset8> 0 differences found dataset: </g2/dset9> and </g2/dset9> -Not comparable: </g2/dset9> or </g2/dset9> is an empty dataset 0 differences found --------------------------------- -Some objects are not comparable --------------------------------- -Use -c for a list of objects. EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_basic1.h5 b/tools/h5diff/testfiles/h5diff_basic1.h5 Binary files differindex 4f3cf9a..e1396be 100644 --- a/tools/h5diff/testfiles/h5diff_basic1.h5 +++ b/tools/h5diff/testfiles/h5diff_basic1.h5 diff --git a/tools/h5diff/testfiles/h5diff_comp_vl_strs.h5 b/tools/h5diff/testfiles/h5diff_comp_vl_strs.h5 Binary files differindex dac510f..4ad6f19 100644 --- a/tools/h5diff/testfiles/h5diff_comp_vl_strs.h5 +++ b/tools/h5diff/testfiles/h5diff_comp_vl_strs.h5 diff --git a/tools/h5diff/testfiles/h5diff_dset_zero_dim_size1.h5 b/tools/h5diff/testfiles/h5diff_dset_zero_dim_size1.h5 Binary files differnew file mode 100644 index 0000000..cdc7644 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_dset_zero_dim_size1.h5 diff --git a/tools/h5diff/testfiles/h5diff_dset_zero_dim_size2.h5 b/tools/h5diff/testfiles/h5diff_dset_zero_dim_size2.h5 Binary files differnew file mode 100644 index 0000000..4752ed1 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_dset_zero_dim_size2.h5 diff --git a/tools/h5diff/testfiles/h5diff_enum_invalid_values.h5 b/tools/h5diff/testfiles/h5diff_enum_invalid_values.h5 Binary files differnew file mode 100755 index 0000000..dd02db9 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_enum_invalid_values.h5 diff --git a/tools/h5diff/testfiles/non_comparables1.h5 b/tools/h5diff/testfiles/non_comparables1.h5 Binary files differnew file mode 100644 index 0000000..71b65c8 --- /dev/null +++ b/tools/h5diff/testfiles/non_comparables1.h5 diff --git a/tools/h5diff/testfiles/non_comparables2.h5 b/tools/h5diff/testfiles/non_comparables2.h5 Binary files differnew file mode 100644 index 0000000..188ceb9 --- /dev/null +++ b/tools/h5diff/testfiles/non_comparables2.h5 |