summaryrefslogtreecommitdiffstats
path: root/tools/h5diff/testfiles
diff options
context:
space:
mode:
authorJonathan Kim <jkm@hdfgroup.org>2010-09-16 18:09:59 (GMT)
committerJonathan Kim <jkm@hdfgroup.org>2010-09-16 18:09:59 (GMT)
commita9a3f22e786983ec4e946bd1a8cdd42ec8058c53 (patch)
treed144bfe7cf780f925535a2466ce37059e6917123 /tools/h5diff/testfiles
parent9f028ea4589cfd21ce610050c75895ed69b2ee08 (diff)
downloadhdf5-a9a3f22e786983ec4e946bd1a8cdd42ec8058c53.zip
hdf5-a9a3f22e786983ec4e946bd1a8cdd42ec8058c53.tar.gz
hdf5-a9a3f22e786983ec4e946bd1a8cdd42ec8058c53.tar.bz2
[svn-r19401] Purpose:
Fix for Bug1975 h5diff - support recursive comparison on group when specified as an object Description: Merged from hdf5 trunk (r19400). Compare member objects and groups recursively when two files or groups are specified to be compared. Support parallel diff and handling symbolic links accordingly. Tested: jam, amani
Diffstat (limited to 'tools/h5diff/testfiles')
-rw-r--r--tools/h5diff/testfiles/h5diff_10.txt30
-rw-r--r--tools/h5diff/testfiles/h5diff_23.txt5
-rw-r--r--tools/h5diff/testfiles/h5diff_26.txt9
-rw-r--r--tools/h5diff/testfiles/h5diff_400.txt17
-rw-r--r--tools/h5diff/testfiles/h5diff_404.txt10
-rw-r--r--tools/h5diff/testfiles/h5diff_410.txt24
-rw-r--r--tools/h5diff/testfiles/h5diff_414.txt8
-rw-r--r--tools/h5diff/testfiles/h5diff_415.txt8
-rw-r--r--tools/h5diff/testfiles/h5diff_416.txt9
-rw-r--r--tools/h5diff/testfiles/h5diff_453.txt17
-rw-r--r--tools/h5diff/testfiles/h5diff_456.txt10
-rw-r--r--tools/h5diff/testfiles/h5diff_500.txt72
-rw-r--r--tools/h5diff/testfiles/h5diff_501.txt188
-rw-r--r--tools/h5diff/testfiles/h5diff_502.txt36
-rw-r--r--tools/h5diff/testfiles/h5diff_503.txt32
-rw-r--r--tools/h5diff/testfiles/h5diff_504.txt19
-rw-r--r--tools/h5diff/testfiles/h5diff_505.txt6
-rw-r--r--tools/h5diff/testfiles/h5diff_506.txt26
-rw-r--r--tools/h5diff/testfiles/h5diff_507.txt6
-rw-r--r--tools/h5diff/testfiles/h5diff_508.txt32
-rw-r--r--tools/h5diff/testfiles/h5diff_509.txt6
-rw-r--r--tools/h5diff/testfiles/h5diff_510.txt32
-rw-r--r--tools/h5diff/testfiles/h5diff_511.txt24
-rw-r--r--tools/h5diff/testfiles/h5diff_512.txt53
-rw-r--r--tools/h5diff/testfiles/h5diff_513.txt3
-rw-r--r--tools/h5diff/testfiles/h5diff_514.txt53
-rw-r--r--tools/h5diff/testfiles/h5diff_600.txt30
-rw-r--r--tools/h5diff/testfiles/h5diff_601.txt2
-rw-r--r--tools/h5diff/testfiles/h5diff_603.txt30
-rw-r--r--tools/h5diff/testfiles/h5diff_606.txt30
-rw-r--r--tools/h5diff/testfiles/h5diff_612.txt30
-rw-r--r--tools/h5diff/testfiles/h5diff_615.txt30
-rw-r--r--tools/h5diff/testfiles/h5diff_621.txt30
-rw-r--r--tools/h5diff/testfiles/h5diff_622.txt30
-rw-r--r--tools/h5diff/testfiles/h5diff_623.txt30
-rw-r--r--tools/h5diff/testfiles/h5diff_624.txt30
-rw-r--r--tools/h5diff/testfiles/h5diff_grp_recurse1.h5bin0 -> 11826 bytes
-rw-r--r--tools/h5diff/testfiles/h5diff_grp_recurse2.h5bin0 -> 11826 bytes
38 files changed, 835 insertions, 172 deletions
diff --git a/tools/h5diff/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt
index d3ee9a6..224f9bc 100644
--- a/tools/h5diff/testfiles/h5diff_10.txt
+++ b/tools/h5diff/testfiles/h5diff_10.txt
@@ -1,4 +1,4 @@
-usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
+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
@@ -69,16 +69,26 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
-v Verbose mode: print the above plus a list of objects and warnings
-q Quiet mode: do not print output
- Compare criteria
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
- with the same absolute path in both files
+ File comparison:
+ If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
+ a comparison of the two files' root groups. That is, h5diff first compares
+ the names of root group members, generates a report of root group objects
+ that appear in only one file or in both files, and recursively compares
+ common objects.
- The compare criteria is:
- 1) datasets: numerical array differences
- 2) groups: name string difference
- 3) datatypes: the return value of H5Tequal
- 4) links: name string difference of the linked value as default
- (refer to --follow-symlinks option).
+ Object comparison:
+ 1) Groups
+ First compares the names of member objects (relative path, from the
+ specified group) and generates a report of objects that appear in only
+ one group or in both groups. Common objects are then compared recursively.
+ 2) Datasets
+ Array rank and dimensions, datatypes, and data values are compared.
+ 3) Datatypes
+ The comparison is based on the return value of H5Tequal.
+ 4) Symbolic links
+ The paths to the target objects are compared.
+ (The option --follow-symlinks overrides the default behavior when
+ symbolic links are compared.).
Exit code:
0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_23.txt b/tools/h5diff/testfiles/h5diff_23.txt
index 5a46ea2..bd1cadb 100644
--- a/tools/h5diff/testfiles/h5diff_23.txt
+++ b/tools/h5diff/testfiles/h5diff_23.txt
@@ -1,3 +1,8 @@
+
+group1 group2
+---------------------------------------
+ x x
+
group : </g1> and </g1>
0 differences found
EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_26.txt b/tools/h5diff/testfiles/h5diff_26.txt
index 8e1fcc3..54a5121 100644
--- a/tools/h5diff/testfiles/h5diff_26.txt
+++ b/tools/h5diff/testfiles/h5diff_26.txt
@@ -1,3 +1,8 @@
+
+group1 group2
+---------------------------------------
+ x x
+
group : </g1> and </g2>
-1 differences found
-EXIT CODE: 1
+0 differences found
+EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_400.txt b/tools/h5diff/testfiles/h5diff_400.txt
index 97db70d..8b3c03c 100644
--- a/tools/h5diff/testfiles/h5diff_400.txt
+++ b/tools/h5diff/testfiles/h5diff_400.txt
@@ -3,10 +3,9 @@ file1 file2
---------------------------------------
x x /
x x /softlink_dset1_1
- x x /softlink_dset1_2
x x /softlink_dset2
x x /softlink_group1
- x x /softlink_group2
+ x x /softlink_group1/dset
x x /softlink_noexist
x x /target_dset1
x x /target_dset2
@@ -15,25 +14,13 @@ file1 file2
group : </> and </>
0 differences found
-link : </softlink_dset1_1> and </softlink_dset1_1>
dataset: </softlink_dset1_1> and </softlink_dset1_1>
0 differences found
-0 differences found
-link : </softlink_dset1_2> and </softlink_dset1_2>
-dataset: </softlink_dset1_2> and </softlink_dset1_2>
-0 differences found
-0 differences found
-link : </softlink_dset2> and </softlink_dset2>
dataset: </softlink_dset2> and </softlink_dset2>
0 differences found
-0 differences found
-link : </softlink_group1> and </softlink_group1>
group : </softlink_group1> and </softlink_group1>
0 differences found
-0 differences found
-link : </softlink_group2> and </softlink_group2>
-group : </softlink_group2> and </softlink_group2>
-0 differences found
+dataset: </softlink_group1/dset> and </softlink_group1/dset>
0 differences found
dangling link: </softlink_noexist> and </softlink_noexist>
0 differences found
diff --git a/tools/h5diff/testfiles/h5diff_404.txt b/tools/h5diff/testfiles/h5diff_404.txt
index c9a476d..db317d1 100644
--- a/tools/h5diff/testfiles/h5diff_404.txt
+++ b/tools/h5diff/testfiles/h5diff_404.txt
@@ -5,27 +5,25 @@ file1 file2
x x /ext_link_dset1
x x /ext_link_dset2
x x /ext_link_grp1
+ x x /ext_link_grp1/x_dset
x x /ext_link_grp2
+ x x /ext_link_grp2/x_dset
x x /ext_link_noexist1
x x /ext_link_noexist2
group : </> and </>
0 differences found
-external link: </ext_link_dset1> and </ext_link_dset1>
dataset: </ext_link_dset1> and </ext_link_dset1>
0 differences found
-0 differences found
-external link: </ext_link_dset2> and </ext_link_dset2>
dataset: </ext_link_dset2> and </ext_link_dset2>
0 differences found
-0 differences found
-external link: </ext_link_grp1> and </ext_link_grp1>
group : </ext_link_grp1> and </ext_link_grp1>
0 differences found
+dataset: </ext_link_grp1/x_dset> and </ext_link_grp1/x_dset>
0 differences found
-external link: </ext_link_grp2> and </ext_link_grp2>
group : </ext_link_grp2> and </ext_link_grp2>
0 differences found
+dataset: </ext_link_grp2/x_dset> and </ext_link_grp2/x_dset>
0 differences found
dangling link: </ext_link_noexist1> and </ext_link_noexist1>
0 differences found
diff --git a/tools/h5diff/testfiles/h5diff_410.txt b/tools/h5diff/testfiles/h5diff_410.txt
index b0924f6..6087bb8 100644
--- a/tools/h5diff/testfiles/h5diff_410.txt
+++ b/tools/h5diff/testfiles/h5diff_410.txt
@@ -23,54 +23,30 @@ file1 file2
group : </> and </>
0 differences found
-link : </softlink1_to_dset1> and </softlink1_to_dset1>
dataset: </softlink1_to_dset1> and </softlink1_to_dset1>
0 differences found
-0 differences found
-link : </softlink1_to_slink1> and </softlink1_to_slink1>
dataset: </softlink1_to_slink1> and </softlink1_to_slink1>
0 differences found
-0 differences found
-link : </softlink1_to_slink2> and </softlink1_to_slink2>
dataset: </softlink1_to_slink2> and </softlink1_to_slink2>
0 differences found
-0 differences found
-link : </softlink2_to_dset2> and </softlink2_to_dset2>
dataset: </softlink2_to_dset2> and </softlink2_to_dset2>
0 differences found
-0 differences found
-link : </softlink2_to_slink1> and </softlink2_to_slink1>
dataset: </softlink2_to_slink1> and </softlink2_to_slink1>
0 differences found
-0 differences found
-link : </softlink2_to_slink2> and </softlink2_to_slink2>
dataset: </softlink2_to_slink2> and </softlink2_to_slink2>
0 differences found
-0 differences found
-link : </softlink3_to_group1> and </softlink3_to_group1>
group : </softlink3_to_group1> and </softlink3_to_group1>
0 differences found
-0 differences found
-link : </softlink3_to_slink1> and </softlink3_to_slink1>
group : </softlink3_to_slink1> and </softlink3_to_slink1>
0 differences found
-0 differences found
-link : </softlink3_to_slink2> and </softlink3_to_slink2>
group : </softlink3_to_slink2> and </softlink3_to_slink2>
0 differences found
-0 differences found
-link : </softlink4_to_group2> and </softlink4_to_group2>
group : </softlink4_to_group2> and </softlink4_to_group2>
0 differences found
-0 differences found
-link : </softlink4_to_slink1> and </softlink4_to_slink1>
group : </softlink4_to_slink1> and </softlink4_to_slink1>
0 differences found
-0 differences found
-link : </softlink4_to_slink2> and </softlink4_to_slink2>
group : </softlink4_to_slink2> and </softlink4_to_slink2>
0 differences found
-0 differences found
dataset: </target_dset1> and </target_dset1>
0 differences found
dataset: </target_dset2> and </target_dset2>
diff --git a/tools/h5diff/testfiles/h5diff_414.txt b/tools/h5diff/testfiles/h5diff_414.txt
index e7a991a..a47349e 100644
--- a/tools/h5diff/testfiles/h5diff_414.txt
+++ b/tools/h5diff/testfiles/h5diff_414.txt
@@ -1,3 +1,9 @@
+
+group1 group2
+---------------------------------------
+ x x
+ x /dset
+
group : </target_group> and </softlink3_to_slink2>
-1 differences found
+0 differences found
EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_415.txt b/tools/h5diff/testfiles/h5diff_415.txt
index 1e97319..30cc947 100644
--- a/tools/h5diff/testfiles/h5diff_415.txt
+++ b/tools/h5diff/testfiles/h5diff_415.txt
@@ -1,3 +1,9 @@
+
+group1 group2
+---------------------------------------
+ x x
+ x /dset
+
group : </softlink3_to_slink2> and </target_group>
-1 differences found
+0 differences found
EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_416.txt b/tools/h5diff/testfiles/h5diff_416.txt
index e4e98b0..551a6c3 100644
--- a/tools/h5diff/testfiles/h5diff_416.txt
+++ b/tools/h5diff/testfiles/h5diff_416.txt
@@ -1,3 +1,8 @@
+
+group1 group2
+---------------------------------------
+ x x
+
group : </softlink3_to_slink2> and </softlink4_to_slink2>
-1 differences found
-EXIT CODE: 1
+0 differences found
+EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_453.txt b/tools/h5diff/testfiles/h5diff_453.txt
index 9c4d61b..8a5ca52 100644
--- a/tools/h5diff/testfiles/h5diff_453.txt
+++ b/tools/h5diff/testfiles/h5diff_453.txt
@@ -3,10 +3,9 @@ file1 file2
---------------------------------------
x x /
x x /softlink_dset1_1
- x x /softlink_dset1_2
x x /softlink_dset2
x x /softlink_group1
- x x /softlink_group2
+ x x /softlink_group1/dset
x x /softlink_noexist
x x /target_dset1
x x /target_dset2
@@ -15,25 +14,13 @@ file1 file2
group : </> and </>
0 differences found
-link : </softlink_dset1_1> and </softlink_dset1_1>
dataset: </softlink_dset1_1> and </softlink_dset1_1>
0 differences found
-0 differences found
-link : </softlink_dset1_2> and </softlink_dset1_2>
-dataset: </softlink_dset1_2> and </softlink_dset1_2>
-0 differences found
-0 differences found
-link : </softlink_dset2> and </softlink_dset2>
dataset: </softlink_dset2> and </softlink_dset2>
0 differences found
-0 differences found
-link : </softlink_group1> and </softlink_group1>
group : </softlink_group1> and </softlink_group1>
0 differences found
-0 differences found
-link : </softlink_group2> and </softlink_group2>
-group : </softlink_group2> and </softlink_group2>
-0 differences found
+dataset: </softlink_group1/dset> and </softlink_group1/dset>
0 differences found
Warning: </softlink_noexist> is a dangling link.
dataset: </target_dset1> and </target_dset1>
diff --git a/tools/h5diff/testfiles/h5diff_456.txt b/tools/h5diff/testfiles/h5diff_456.txt
index f20e403..9317988 100644
--- a/tools/h5diff/testfiles/h5diff_456.txt
+++ b/tools/h5diff/testfiles/h5diff_456.txt
@@ -5,27 +5,25 @@ file1 file2
x x /ext_link_dset1
x x /ext_link_dset2
x x /ext_link_grp1
+ x x /ext_link_grp1/x_dset
x x /ext_link_grp2
+ x x /ext_link_grp2/x_dset
x x /ext_link_noexist1
x x /ext_link_noexist2
group : </> and </>
0 differences found
-external link: </ext_link_dset1> and </ext_link_dset1>
dataset: </ext_link_dset1> and </ext_link_dset1>
0 differences found
-0 differences found
-external link: </ext_link_dset2> and </ext_link_dset2>
dataset: </ext_link_dset2> and </ext_link_dset2>
0 differences found
-0 differences found
-external link: </ext_link_grp1> and </ext_link_grp1>
group : </ext_link_grp1> and </ext_link_grp1>
0 differences found
+dataset: </ext_link_grp1/x_dset> and </ext_link_grp1/x_dset>
0 differences found
-external link: </ext_link_grp2> and </ext_link_grp2>
group : </ext_link_grp2> and </ext_link_grp2>
0 differences found
+dataset: </ext_link_grp2/x_dset> and </ext_link_grp2/x_dset>
0 differences found
Warning: </ext_link_noexist1> is a dangling link.
Warning: </ext_link_noexist2> is a dangling link.
diff --git a/tools/h5diff/testfiles/h5diff_500.txt b/tools/h5diff/testfiles/h5diff_500.txt
new file mode 100644
index 0000000..7d688d2
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_500.txt
@@ -0,0 +1,72 @@
+
+file1 file2
+---------------------------------------
+ x x /
+ x x /dset1
+ x x /dset2
+ x x /dset3
+ x x /elink_grp1
+ x x /elink_grp2
+ x x /elink_grp3
+ x x /grp1
+ x x /grp1/dset1
+ x x /grp1/grp2
+ x x /grp1/grp2/dset1
+ x x /grp1/grp2/dset2
+ x x /grp1/grp2/grp3
+ x x /grp1/grp2/grp3/dset1
+ x x /grp1/grp2/grp3/dset2
+ x x /grp1/grp2/grp3/dset3
+ x /grp10
+ x /grp10/dset4
+ x /grp10/dset5
+ x /grp10/elink_grp_circle
+ x /grp11
+ x /grp11/dset4
+ x /grp11/dset5
+ x /grp11/elink_grp_circle
+ x x /slink_grp1
+ x /slink_grp10
+ x /slink_grp11
+ x x /slink_grp2
+ x x /slink_grp3
+
+group : </> and </>
+0 differences found
+dataset: </dset1> and </dset1>
+0 differences found
+dataset: </dset2> and </dset2>
+0 differences found
+dataset: </dset3> and </dset3>
+0 differences found
+external link: </elink_grp1> and </elink_grp1>
+1 differences found
+external link: </elink_grp2> and </elink_grp2>
+1 differences found
+external link: </elink_grp3> and </elink_grp3>
+1 differences found
+group : </grp1> and </grp1>
+0 differences found
+dataset: </grp1/dset1> and </grp1/dset1>
+0 differences found
+group : </grp1/grp2> and </grp1/grp2>
+0 differences found
+dataset: </grp1/grp2/dset1> and </grp1/grp2/dset1>
+0 differences found
+dataset: </grp1/grp2/dset2> and </grp1/grp2/dset2>
+0 differences found
+group : </grp1/grp2/grp3> and </grp1/grp2/grp3>
+0 differences found
+dataset: </grp1/grp2/grp3/dset1> and </grp1/grp2/grp3/dset1>
+0 differences found
+dataset: </grp1/grp2/grp3/dset2> and </grp1/grp2/grp3/dset2>
+0 differences found
+dataset: </grp1/grp2/grp3/dset3> and </grp1/grp2/grp3/dset3>
+0 differences found
+link : </slink_grp1> and </slink_grp1>
+0 differences found
+link : </slink_grp2> and </slink_grp2>
+0 differences found
+link : </slink_grp3> and </slink_grp3>
+0 differences found
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_501.txt b/tools/h5diff/testfiles/h5diff_501.txt
new file mode 100644
index 0000000..75e91da
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_501.txt
@@ -0,0 +1,188 @@
+
+file1 file2
+---------------------------------------
+ x x /
+ x x /dset1
+ x x /dset2
+ x x /dset3
+ x x /elink_grp1
+ x x /elink_grp1/dset1
+ x x /elink_grp1/grp2
+ x x /elink_grp1/grp2/dset1
+ x x /elink_grp1/grp2/dset2
+ x x /elink_grp1/grp2/grp3
+ x x /elink_grp1/grp2/grp3/dset1
+ x x /elink_grp1/grp2/grp3/dset2
+ x x /elink_grp1/grp2/grp3/dset3
+ x x /elink_grp2
+ x x /elink_grp2/dset1
+ x x /elink_grp2/dset2
+ x x /elink_grp2/grp3
+ x x /elink_grp2/grp3/dset1
+ x x /elink_grp2/grp3/dset2
+ x x /elink_grp2/grp3/dset3
+ x x /elink_grp3
+ x x /elink_grp3/dset1
+ x x /elink_grp3/dset2
+ x x /elink_grp3/dset3
+ x x /grp1
+ x x /grp1/dset1
+ x x /grp1/grp2
+ x x /grp1/grp2/dset1
+ x x /grp1/grp2/dset2
+ x x /grp1/grp2/grp3
+ x x /grp1/grp2/grp3/dset1
+ x x /grp1/grp2/grp3/dset2
+ x x /grp1/grp2/grp3/dset3
+ x /grp10
+ x /grp10/dset4
+ x /grp10/dset5
+ x /grp10/elink_grp_circle
+ x /grp10/elink_grp_circle/dset4
+ x /grp10/elink_grp_circle/dset5
+ x /grp10/elink_grp_circle/elink_grp_circle
+ x /grp10/elink_grp_circle/elink_grp_circle/dset4
+ x /grp10/elink_grp_circle/elink_grp_circle/dset5
+ x /grp11
+ x /grp11/dset4
+ x /grp11/dset5
+ x /grp11/elink_grp_circle
+ x /grp11/elink_grp_circle/dset4
+ x /grp11/elink_grp_circle/dset5
+ x /grp11/elink_grp_circle/elink_grp_circle
+ x /grp11/elink_grp_circle/elink_grp_circle/dset4
+ x /grp11/elink_grp_circle/elink_grp_circle/dset5
+ x x /slink_grp1
+ x x /slink_grp1/dset1
+ x x /slink_grp1/grp2
+ x x /slink_grp1/grp2/dset1
+ x x /slink_grp1/grp2/dset2
+ x x /slink_grp1/grp2/grp3
+ x x /slink_grp1/grp2/grp3/dset1
+ x x /slink_grp1/grp2/grp3/dset2
+ x x /slink_grp1/grp2/grp3/dset3
+ x /slink_grp10
+ x /slink_grp10/dset4
+ x /slink_grp10/dset5
+ x /slink_grp11
+ x /slink_grp11/dset4
+ x /slink_grp11/dset5
+ x x /slink_grp2
+ x x /slink_grp2/dset1
+ x x /slink_grp2/dset2
+ x x /slink_grp2/grp3
+ x x /slink_grp2/grp3/dset1
+ x x /slink_grp2/grp3/dset2
+ x x /slink_grp2/grp3/dset3
+ x x /slink_grp3
+ x x /slink_grp3/dset1
+ x x /slink_grp3/dset2
+ x x /slink_grp3/dset3
+
+group : </> and </>
+0 differences found
+dataset: </dset1> and </dset1>
+0 differences found
+dataset: </dset2> and </dset2>
+0 differences found
+dataset: </dset3> and </dset3>
+0 differences found
+group : </elink_grp1> and </elink_grp1>
+0 differences found
+dataset: </elink_grp1/dset1> and </elink_grp1/dset1>
+0 differences found
+group : </elink_grp1/grp2> and </elink_grp1/grp2>
+0 differences found
+dataset: </elink_grp1/grp2/dset1> and </elink_grp1/grp2/dset1>
+0 differences found
+dataset: </elink_grp1/grp2/dset2> and </elink_grp1/grp2/dset2>
+0 differences found
+group : </elink_grp1/grp2/grp3> and </elink_grp1/grp2/grp3>
+0 differences found
+dataset: </elink_grp1/grp2/grp3/dset1> and </elink_grp1/grp2/grp3/dset1>
+0 differences found
+dataset: </elink_grp1/grp2/grp3/dset2> and </elink_grp1/grp2/grp3/dset2>
+0 differences found
+dataset: </elink_grp1/grp2/grp3/dset3> and </elink_grp1/grp2/grp3/dset3>
+0 differences found
+group : </elink_grp2> and </elink_grp2>
+0 differences found
+dataset: </elink_grp2/dset1> and </elink_grp2/dset1>
+0 differences found
+dataset: </elink_grp2/dset2> and </elink_grp2/dset2>
+0 differences found
+group : </elink_grp2/grp3> and </elink_grp2/grp3>
+0 differences found
+dataset: </elink_grp2/grp3/dset1> and </elink_grp2/grp3/dset1>
+0 differences found
+dataset: </elink_grp2/grp3/dset2> and </elink_grp2/grp3/dset2>
+0 differences found
+dataset: </elink_grp2/grp3/dset3> and </elink_grp2/grp3/dset3>
+0 differences found
+group : </elink_grp3> and </elink_grp3>
+0 differences found
+dataset: </elink_grp3/dset1> and </elink_grp3/dset1>
+0 differences found
+dataset: </elink_grp3/dset2> and </elink_grp3/dset2>
+0 differences found
+dataset: </elink_grp3/dset3> and </elink_grp3/dset3>
+0 differences found
+group : </grp1> and </grp1>
+0 differences found
+dataset: </grp1/dset1> and </grp1/dset1>
+0 differences found
+group : </grp1/grp2> and </grp1/grp2>
+0 differences found
+dataset: </grp1/grp2/dset1> and </grp1/grp2/dset1>
+0 differences found
+dataset: </grp1/grp2/dset2> and </grp1/grp2/dset2>
+0 differences found
+group : </grp1/grp2/grp3> and </grp1/grp2/grp3>
+0 differences found
+dataset: </grp1/grp2/grp3/dset1> and </grp1/grp2/grp3/dset1>
+0 differences found
+dataset: </grp1/grp2/grp3/dset2> and </grp1/grp2/grp3/dset2>
+0 differences found
+dataset: </grp1/grp2/grp3/dset3> and </grp1/grp2/grp3/dset3>
+0 differences found
+group : </slink_grp1> and </slink_grp1>
+0 differences found
+dataset: </slink_grp1/dset1> and </slink_grp1/dset1>
+0 differences found
+group : </slink_grp1/grp2> and </slink_grp1/grp2>
+0 differences found
+dataset: </slink_grp1/grp2/dset1> and </slink_grp1/grp2/dset1>
+0 differences found
+dataset: </slink_grp1/grp2/dset2> and </slink_grp1/grp2/dset2>
+0 differences found
+group : </slink_grp1/grp2/grp3> and </slink_grp1/grp2/grp3>
+0 differences found
+dataset: </slink_grp1/grp2/grp3/dset1> and </slink_grp1/grp2/grp3/dset1>
+0 differences found
+dataset: </slink_grp1/grp2/grp3/dset2> and </slink_grp1/grp2/grp3/dset2>
+0 differences found
+dataset: </slink_grp1/grp2/grp3/dset3> and </slink_grp1/grp2/grp3/dset3>
+0 differences found
+group : </slink_grp2> and </slink_grp2>
+0 differences found
+dataset: </slink_grp2/dset1> and </slink_grp2/dset1>
+0 differences found
+dataset: </slink_grp2/dset2> and </slink_grp2/dset2>
+0 differences found
+group : </slink_grp2/grp3> and </slink_grp2/grp3>
+0 differences found
+dataset: </slink_grp2/grp3/dset1> and </slink_grp2/grp3/dset1>
+0 differences found
+dataset: </slink_grp2/grp3/dset2> and </slink_grp2/grp3/dset2>
+0 differences found
+dataset: </slink_grp2/grp3/dset3> and </slink_grp2/grp3/dset3>
+0 differences found
+group : </slink_grp3> and </slink_grp3>
+0 differences found
+dataset: </slink_grp3/dset1> and </slink_grp3/dset1>
+0 differences found
+dataset: </slink_grp3/dset2> and </slink_grp3/dset2>
+0 differences found
+dataset: </slink_grp3/dset3> and </slink_grp3/dset3>
+0 differences found
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_502.txt b/tools/h5diff/testfiles/h5diff_502.txt
new file mode 100644
index 0000000..d3de6e5
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_502.txt
@@ -0,0 +1,36 @@
+
+group1 group2
+---------------------------------------
+ x
+ x /
+ x x /dset1
+ x x /dset2
+ x x /dset3
+ x /elink_grp1
+ x /elink_grp2
+ x /elink_grp3
+ x /grp1
+ x /grp1/dset1
+ x /grp1/grp2
+ x /grp1/grp2/dset1
+ x /grp1/grp2/dset2
+ x /grp1/grp2/grp3
+ x /grp1/grp2/grp3/dset1
+ x /grp1/grp2/grp3/dset2
+ x /grp1/grp2/grp3/dset3
+ x /grp10
+ x /grp10/dset4
+ x /grp10/dset5
+ x /grp10/elink_grp_circle
+ x /slink_grp1
+ x /slink_grp10
+ x /slink_grp2
+ x /slink_grp3
+
+dataset: </dset1> and </grp1/grp2/grp3/dset1>
+0 differences found
+dataset: </dset2> and </grp1/grp2/grp3/dset2>
+0 differences found
+dataset: </dset3> and </grp1/grp2/grp3/dset3>
+0 differences found
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_503.txt b/tools/h5diff/testfiles/h5diff_503.txt
new file mode 100644
index 0000000..cf01598
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_503.txt
@@ -0,0 +1,32 @@
+
+group1 group2
+---------------------------------------
+ x x
+ x x /dset1
+ x x /grp2
+ x x /grp2/dset1
+ x x /grp2/dset2
+ x x /grp2/grp3
+ x x /grp2/grp3/dset1
+ x x /grp2/grp3/dset2
+ x x /grp2/grp3/dset3
+
+group : </grp1> and </grp1>
+0 differences found
+dataset: </grp1/dset1> and </grp1/dset1>
+0 differences found
+group : </grp1/grp2> and </grp1/grp2>
+0 differences found
+dataset: </grp1/grp2/dset1> and </grp1/grp2/dset1>
+0 differences found
+dataset: </grp1/grp2/dset2> and </grp1/grp2/dset2>
+0 differences found
+group : </grp1/grp2/grp3> and </grp1/grp2/grp3>
+0 differences found
+dataset: </grp1/grp2/grp3/dset1> and </grp1/grp2/grp3/dset1>
+0 differences found
+dataset: </grp1/grp2/grp3/dset2> and </grp1/grp2/grp3/dset2>
+0 differences found
+dataset: </grp1/grp2/grp3/dset3> and </grp1/grp2/grp3/dset3>
+0 differences found
+EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_504.txt b/tools/h5diff/testfiles/h5diff_504.txt
new file mode 100644
index 0000000..6cf43b3
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_504.txt
@@ -0,0 +1,19 @@
+
+group1 group2
+---------------------------------------
+ x x
+ x x /dset1
+ x x /dset2
+ x /dset3
+ x /grp3
+ x /grp3/dset1
+ x /grp3/dset2
+ x /grp3/dset3
+
+group : </grp1/grp2> and </grp1/grp2/grp3>
+0 differences found
+dataset: </grp1/grp2/dset1> and </grp1/grp2/grp3/dset1>
+0 differences found
+dataset: </grp1/grp2/dset2> and </grp1/grp2/grp3/dset2>
+0 differences found
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_505.txt b/tools/h5diff/testfiles/h5diff_505.txt
new file mode 100644
index 0000000..28640b7
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_505.txt
@@ -0,0 +1,6 @@
+</grp1> is of type H5G_GROUP and </slink_grp1> is of type H5G_LINK
+--------------------------------
+Some objects are not comparable
+--------------------------------
+Use -c for a list of objects.
+EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_506.txt b/tools/h5diff/testfiles/h5diff_506.txt
new file mode 100644
index 0000000..efef9a7
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_506.txt
@@ -0,0 +1,26 @@
+
+group1 group2
+---------------------------------------
+ x x
+ x x /dset1
+ x x /dset2
+ x x /grp3
+ x x /grp3/dset1
+ x x /grp3/dset2
+ x x /grp3/dset3
+
+group : </grp1/grp2> and </slink_grp2>
+0 differences found
+dataset: </grp1/grp2/dset1> and </slink_grp2/dset1>
+0 differences found
+dataset: </grp1/grp2/dset2> and </slink_grp2/dset2>
+0 differences found
+group : </grp1/grp2/grp3> and </slink_grp2/grp3>
+0 differences found
+dataset: </grp1/grp2/grp3/dset1> and </slink_grp2/grp3/dset1>
+0 differences found
+dataset: </grp1/grp2/grp3/dset2> and </slink_grp2/grp3/dset2>
+0 differences found
+dataset: </grp1/grp2/grp3/dset3> and </slink_grp2/grp3/dset3>
+0 differences found
+EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_507.txt b/tools/h5diff/testfiles/h5diff_507.txt
new file mode 100644
index 0000000..ed2b799
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_507.txt
@@ -0,0 +1,6 @@
+</grp1> is of type H5G_GROUP and </elink_grp1> is of type H5G_UDLINK
+--------------------------------
+Some objects are not comparable
+--------------------------------
+Use -c for a list of objects.
+EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_508.txt b/tools/h5diff/testfiles/h5diff_508.txt
new file mode 100644
index 0000000..9796345
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_508.txt
@@ -0,0 +1,32 @@
+
+group1 group2
+---------------------------------------
+ x x
+ x x /dset1
+ x x /grp2
+ x x /grp2/dset1
+ x x /grp2/dset2
+ x x /grp2/grp3
+ x x /grp2/grp3/dset1
+ x x /grp2/grp3/dset2
+ x x /grp2/grp3/dset3
+
+group : </grp1> and </elink_grp1>
+0 differences found
+dataset: </grp1/dset1> and </elink_grp1/dset1>
+0 differences found
+group : </grp1/grp2> and </elink_grp1/grp2>
+0 differences found
+dataset: </grp1/grp2/dset1> and </elink_grp1/grp2/dset1>
+0 differences found
+dataset: </grp1/grp2/dset2> and </elink_grp1/grp2/dset2>
+0 differences found
+group : </grp1/grp2/grp3> and </elink_grp1/grp2/grp3>
+0 differences found
+dataset: </grp1/grp2/grp3/dset1> and </elink_grp1/grp2/grp3/dset1>
+0 differences found
+dataset: </grp1/grp2/grp3/dset2> and </elink_grp1/grp2/grp3/dset2>
+0 differences found
+dataset: </grp1/grp2/grp3/dset3> and </elink_grp1/grp2/grp3/dset3>
+0 differences found
+EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_509.txt b/tools/h5diff/testfiles/h5diff_509.txt
new file mode 100644
index 0000000..145cd9d
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_509.txt
@@ -0,0 +1,6 @@
+</slink_grp1> is of type H5G_LINK and </elink_grp1> is of type H5G_UDLINK
+--------------------------------
+Some objects are not comparable
+--------------------------------
+Use -c for a list of objects.
+EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_510.txt b/tools/h5diff/testfiles/h5diff_510.txt
new file mode 100644
index 0000000..9d92768
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_510.txt
@@ -0,0 +1,32 @@
+
+group1 group2
+---------------------------------------
+ x x
+ x x /dset1
+ x x /grp2
+ x x /grp2/dset1
+ x x /grp2/dset2
+ x x /grp2/grp3
+ x x /grp2/grp3/dset1
+ x x /grp2/grp3/dset2
+ x x /grp2/grp3/dset3
+
+group : </slink_grp1> and </elink_grp1>
+0 differences found
+dataset: </slink_grp1/dset1> and </elink_grp1/dset1>
+0 differences found
+group : </slink_grp1/grp2> and </elink_grp1/grp2>
+0 differences found
+dataset: </slink_grp1/grp2/dset1> and </elink_grp1/grp2/dset1>
+0 differences found
+dataset: </slink_grp1/grp2/dset2> and </elink_grp1/grp2/dset2>
+0 differences found
+group : </slink_grp1/grp2/grp3> and </elink_grp1/grp2/grp3>
+0 differences found
+dataset: </slink_grp1/grp2/grp3/dset1> and </elink_grp1/grp2/grp3/dset1>
+0 differences found
+dataset: </slink_grp1/grp2/grp3/dset2> and </elink_grp1/grp2/grp3/dset2>
+0 differences found
+dataset: </slink_grp1/grp2/grp3/dset3> and </elink_grp1/grp2/grp3/dset3>
+0 differences found
+EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_511.txt b/tools/h5diff/testfiles/h5diff_511.txt
new file mode 100644
index 0000000..4bac100
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_511.txt
@@ -0,0 +1,24 @@
+
+group1 group2
+---------------------------------------
+ x x
+ x x /dset4
+ x x /dset5
+ x x /elink_grp_circle
+
+group : </grp10> and </grp11>
+0 differences found
+dataset: </grp10/dset4> and </grp11/dset4>
+0 differences found
+dataset: </grp10/dset5> and </grp11/dset5>
+size: [2x4] [2x4]
+position dset5 dset5 difference
+------------------------------------------------------------
+[ 0 1 ] 3 2 1
+[ 0 3 ] 3 2 1
+[ 1 0 ] 3 2 1
+[ 1 2 ] 3 2 1
+4 differences found
+external link: </grp10/elink_grp_circle> and </grp11/elink_grp_circle>
+1 differences found
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_512.txt b/tools/h5diff/testfiles/h5diff_512.txt
new file mode 100644
index 0000000..23fbc12
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_512.txt
@@ -0,0 +1,53 @@
+
+group1 group2
+---------------------------------------
+ x x
+ x x /dset4
+ x x /dset5
+ x x /elink_grp_circle
+ x x /elink_grp_circle/dset4
+ x x /elink_grp_circle/dset5
+ x x /elink_grp_circle/elink_grp_circle
+ x x /elink_grp_circle/elink_grp_circle/dset4
+ x x /elink_grp_circle/elink_grp_circle/dset5
+
+group : </grp10> and </grp11>
+0 differences found
+dataset: </grp10/dset4> and </grp11/dset4>
+0 differences found
+dataset: </grp10/dset5> and </grp11/dset5>
+size: [2x4] [2x4]
+position dset5 dset5 difference
+------------------------------------------------------------
+[ 0 1 ] 3 2 1
+[ 0 3 ] 3 2 1
+[ 1 0 ] 3 2 1
+[ 1 2 ] 3 2 1
+4 differences found
+group : </grp10/elink_grp_circle> and </grp11/elink_grp_circle>
+0 differences found
+dataset: </grp10/elink_grp_circle/dset4> and </grp11/elink_grp_circle/dset4>
+0 differences found
+dataset: </grp10/elink_grp_circle/dset5> and </grp11/elink_grp_circle/dset5>
+size: [2x4] [2x4]
+position dset5 dset5 difference
+------------------------------------------------------------
+[ 0 1 ] 2 3 1
+[ 0 3 ] 2 3 1
+[ 1 0 ] 2 3 1
+[ 1 2 ] 2 3 1
+4 differences found
+group : </grp10/elink_grp_circle/elink_grp_circle> and </grp11/elink_grp_circle/elink_grp_circle>
+0 differences found
+dataset: </grp10/elink_grp_circle/elink_grp_circle/dset4> and </grp11/elink_grp_circle/elink_grp_circle/dset4>
+0 differences found
+dataset: </grp10/elink_grp_circle/elink_grp_circle/dset5> and </grp11/elink_grp_circle/elink_grp_circle/dset5>
+size: [2x4] [2x4]
+position dset5 dset5 difference
+------------------------------------------------------------
+[ 0 1 ] 3 2 1
+[ 0 3 ] 3 2 1
+[ 1 0 ] 3 2 1
+[ 1 2 ] 3 2 1
+4 differences found
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_513.txt b/tools/h5diff/testfiles/h5diff_513.txt
new file mode 100644
index 0000000..b0af15d
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_513.txt
@@ -0,0 +1,3 @@
+link : </slink_grp10> and </slink_grp11>
+1 differences found
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_514.txt b/tools/h5diff/testfiles/h5diff_514.txt
new file mode 100644
index 0000000..f8e16e9
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_514.txt
@@ -0,0 +1,53 @@
+
+group1 group2
+---------------------------------------
+ x x
+ x x /dset4
+ x x /dset5
+ x x /elink_grp_circle
+ x x /elink_grp_circle/dset4
+ x x /elink_grp_circle/dset5
+ x x /elink_grp_circle/elink_grp_circle
+ x x /elink_grp_circle/elink_grp_circle/dset4
+ x x /elink_grp_circle/elink_grp_circle/dset5
+
+group : </slink_grp10> and </slink_grp11>
+0 differences found
+dataset: </slink_grp10/dset4> and </slink_grp11/dset4>
+0 differences found
+dataset: </slink_grp10/dset5> and </slink_grp11/dset5>
+size: [2x4] [2x4]
+position dset5 dset5 difference
+------------------------------------------------------------
+[ 0 1 ] 3 2 1
+[ 0 3 ] 3 2 1
+[ 1 0 ] 3 2 1
+[ 1 2 ] 3 2 1
+4 differences found
+group : </slink_grp10/elink_grp_circle> and </slink_grp11/elink_grp_circle>
+0 differences found
+dataset: </slink_grp10/elink_grp_circle/dset4> and </slink_grp11/elink_grp_circle/dset4>
+0 differences found
+dataset: </slink_grp10/elink_grp_circle/dset5> and </slink_grp11/elink_grp_circle/dset5>
+size: [2x4] [2x4]
+position dset5 dset5 difference
+------------------------------------------------------------
+[ 0 1 ] 2 3 1
+[ 0 3 ] 2 3 1
+[ 1 0 ] 2 3 1
+[ 1 2 ] 2 3 1
+4 differences found
+group : </slink_grp10/elink_grp_circle/elink_grp_circle> and </slink_grp11/elink_grp_circle/elink_grp_circle>
+0 differences found
+dataset: </slink_grp10/elink_grp_circle/elink_grp_circle/dset4> and </slink_grp11/elink_grp_circle/elink_grp_circle/dset4>
+0 differences found
+dataset: </slink_grp10/elink_grp_circle/elink_grp_circle/dset5> and </slink_grp11/elink_grp_circle/elink_grp_circle/dset5>
+size: [2x4] [2x4]
+position dset5 dset5 difference
+------------------------------------------------------------
+[ 0 1 ] 3 2 1
+[ 0 3 ] 3 2 1
+[ 1 0 ] 3 2 1
+[ 1 2 ] 3 2 1
+4 differences found
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_600.txt b/tools/h5diff/testfiles/h5diff_600.txt
index cf540ab..b096ab5 100644
--- a/tools/h5diff/testfiles/h5diff_600.txt
+++ b/tools/h5diff/testfiles/h5diff_600.txt
@@ -1,4 +1,4 @@
-usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
+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
@@ -69,16 +69,26 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
-v Verbose mode: print the above plus a list of objects and warnings
-q Quiet mode: do not print output
- Compare criteria
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
- with the same absolute path in both files
+ File comparison:
+ If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
+ a comparison of the two files' root groups. That is, h5diff first compares
+ the names of root group members, generates a report of root group objects
+ that appear in only one file or in both files, and recursively compares
+ common objects.
- The compare criteria is:
- 1) datasets: numerical array differences
- 2) groups: name string difference
- 3) datatypes: the return value of H5Tequal
- 4) links: name string difference of the linked value as default
- (refer to --follow-symlinks option).
+ Object comparison:
+ 1) Groups
+ First compares the names of member objects (relative path, from the
+ specified group) and generates a report of objects that appear in only
+ one group or in both groups. Common objects are then compared recursively.
+ 2) Datasets
+ Array rank and dimensions, datatypes, and data values are compared.
+ 3) Datatypes
+ The comparison is based on the return value of H5Tequal.
+ 4) Symbolic links
+ The paths to the target objects are compared.
+ (The option --follow-symlinks overrides the default behavior when
+ symbolic links are compared.).
Exit code:
0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_601.txt b/tools/h5diff/testfiles/h5diff_601.txt
new file mode 100644
index 0000000..eb12f38
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_601.txt
@@ -0,0 +1,2 @@
+Object </nono_obj> could not be found in <h5diff_basic1.h5>
+EXIT CODE: 2
diff --git a/tools/h5diff/testfiles/h5diff_603.txt b/tools/h5diff/testfiles/h5diff_603.txt
index 2f2e93f..2b37530 100644
--- a/tools/h5diff/testfiles/h5diff_603.txt
+++ b/tools/h5diff/testfiles/h5diff_603.txt
@@ -1,5 +1,5 @@
<-d -4> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
+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
@@ -70,16 +70,26 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
-v Verbose mode: print the above plus a list of objects and warnings
-q Quiet mode: do not print output
- Compare criteria
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
- with the same absolute path in both files
+ File comparison:
+ If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
+ a comparison of the two files' root groups. That is, h5diff first compares
+ the names of root group members, generates a report of root group objects
+ that appear in only one file or in both files, and recursively compares
+ common objects.
- The compare criteria is:
- 1) datasets: numerical array differences
- 2) groups: name string difference
- 3) datatypes: the return value of H5Tequal
- 4) links: name string difference of the linked value as default
- (refer to --follow-symlinks option).
+ Object comparison:
+ 1) Groups
+ First compares the names of member objects (relative path, from the
+ specified group) and generates a report of objects that appear in only
+ one group or in both groups. Common objects are then compared recursively.
+ 2) Datasets
+ Array rank and dimensions, datatypes, and data values are compared.
+ 3) Datatypes
+ The comparison is based on the return value of H5Tequal.
+ 4) Symbolic links
+ The paths to the target objects are compared.
+ (The option --follow-symlinks overrides the default behavior when
+ symbolic links are compared.).
Exit code:
0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_606.txt b/tools/h5diff/testfiles/h5diff_606.txt
index 3381406..63a1d53 100644
--- a/tools/h5diff/testfiles/h5diff_606.txt
+++ b/tools/h5diff/testfiles/h5diff_606.txt
@@ -1,5 +1,5 @@
<-d 0x1> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
+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
@@ -70,16 +70,26 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
-v Verbose mode: print the above plus a list of objects and warnings
-q Quiet mode: do not print output
- Compare criteria
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
- with the same absolute path in both files
+ File comparison:
+ If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
+ a comparison of the two files' root groups. That is, h5diff first compares
+ the names of root group members, generates a report of root group objects
+ that appear in only one file or in both files, and recursively compares
+ common objects.
- The compare criteria is:
- 1) datasets: numerical array differences
- 2) groups: name string difference
- 3) datatypes: the return value of H5Tequal
- 4) links: name string difference of the linked value as default
- (refer to --follow-symlinks option).
+ Object comparison:
+ 1) Groups
+ First compares the names of member objects (relative path, from the
+ specified group) and generates a report of objects that appear in only
+ one group or in both groups. Common objects are then compared recursively.
+ 2) Datasets
+ Array rank and dimensions, datatypes, and data values are compared.
+ 3) Datatypes
+ The comparison is based on the return value of H5Tequal.
+ 4) Symbolic links
+ The paths to the target objects are compared.
+ (The option --follow-symlinks overrides the default behavior when
+ symbolic links are compared.).
Exit code:
0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt
index 8c6051e..6141495 100644
--- a/tools/h5diff/testfiles/h5diff_612.txt
+++ b/tools/h5diff/testfiles/h5diff_612.txt
@@ -1,5 +1,5 @@
<-p -4> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
+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
@@ -70,16 +70,26 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
-v Verbose mode: print the above plus a list of objects and warnings
-q Quiet mode: do not print output
- Compare criteria
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
- with the same absolute path in both files
+ File comparison:
+ If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
+ a comparison of the two files' root groups. That is, h5diff first compares
+ the names of root group members, generates a report of root group objects
+ that appear in only one file or in both files, and recursively compares
+ common objects.
- The compare criteria is:
- 1) datasets: numerical array differences
- 2) groups: name string difference
- 3) datatypes: the return value of H5Tequal
- 4) links: name string difference of the linked value as default
- (refer to --follow-symlinks option).
+ Object comparison:
+ 1) Groups
+ First compares the names of member objects (relative path, from the
+ specified group) and generates a report of objects that appear in only
+ one group or in both groups. Common objects are then compared recursively.
+ 2) Datasets
+ Array rank and dimensions, datatypes, and data values are compared.
+ 3) Datatypes
+ The comparison is based on the return value of H5Tequal.
+ 4) Symbolic links
+ The paths to the target objects are compared.
+ (The option --follow-symlinks overrides the default behavior when
+ symbolic links are compared.).
Exit code:
0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_615.txt b/tools/h5diff/testfiles/h5diff_615.txt
index b713c7b..eaa2078 100644
--- a/tools/h5diff/testfiles/h5diff_615.txt
+++ b/tools/h5diff/testfiles/h5diff_615.txt
@@ -1,5 +1,5 @@
<-p 0x1> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
+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
@@ -70,16 +70,26 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
-v Verbose mode: print the above plus a list of objects and warnings
-q Quiet mode: do not print output
- Compare criteria
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
- with the same absolute path in both files
+ File comparison:
+ If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
+ a comparison of the two files' root groups. That is, h5diff first compares
+ the names of root group members, generates a report of root group objects
+ that appear in only one file or in both files, and recursively compares
+ common objects.
- The compare criteria is:
- 1) datasets: numerical array differences
- 2) groups: name string difference
- 3) datatypes: the return value of H5Tequal
- 4) links: name string difference of the linked value as default
- (refer to --follow-symlinks option).
+ Object comparison:
+ 1) Groups
+ First compares the names of member objects (relative path, from the
+ specified group) and generates a report of objects that appear in only
+ one group or in both groups. Common objects are then compared recursively.
+ 2) Datasets
+ Array rank and dimensions, datatypes, and data values are compared.
+ 3) Datatypes
+ The comparison is based on the return value of H5Tequal.
+ 4) Symbolic links
+ The paths to the target objects are compared.
+ (The option --follow-symlinks overrides the default behavior when
+ symbolic links are compared.).
Exit code:
0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt
index ee23b90..8319db9 100644
--- a/tools/h5diff/testfiles/h5diff_621.txt
+++ b/tools/h5diff/testfiles/h5diff_621.txt
@@ -1,5 +1,5 @@
<-n -4> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
+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
@@ -70,16 +70,26 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
-v Verbose mode: print the above plus a list of objects and warnings
-q Quiet mode: do not print output
- Compare criteria
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
- with the same absolute path in both files
+ File comparison:
+ If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
+ a comparison of the two files' root groups. That is, h5diff first compares
+ the names of root group members, generates a report of root group objects
+ that appear in only one file or in both files, and recursively compares
+ common objects.
- The compare criteria is:
- 1) datasets: numerical array differences
- 2) groups: name string difference
- 3) datatypes: the return value of H5Tequal
- 4) links: name string difference of the linked value as default
- (refer to --follow-symlinks option).
+ Object comparison:
+ 1) Groups
+ First compares the names of member objects (relative path, from the
+ specified group) and generates a report of objects that appear in only
+ one group or in both groups. Common objects are then compared recursively.
+ 2) Datasets
+ Array rank and dimensions, datatypes, and data values are compared.
+ 3) Datatypes
+ The comparison is based on the return value of H5Tequal.
+ 4) Symbolic links
+ The paths to the target objects are compared.
+ (The option --follow-symlinks overrides the default behavior when
+ symbolic links are compared.).
Exit code:
0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_622.txt b/tools/h5diff/testfiles/h5diff_622.txt
index 11e2ce1..1ccff92 100644
--- a/tools/h5diff/testfiles/h5diff_622.txt
+++ b/tools/h5diff/testfiles/h5diff_622.txt
@@ -1,5 +1,5 @@
<-n 0> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
+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
@@ -70,16 +70,26 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
-v Verbose mode: print the above plus a list of objects and warnings
-q Quiet mode: do not print output
- Compare criteria
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
- with the same absolute path in both files
+ File comparison:
+ If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
+ a comparison of the two files' root groups. That is, h5diff first compares
+ the names of root group members, generates a report of root group objects
+ that appear in only one file or in both files, and recursively compares
+ common objects.
- The compare criteria is:
- 1) datasets: numerical array differences
- 2) groups: name string difference
- 3) datatypes: the return value of H5Tequal
- 4) links: name string difference of the linked value as default
- (refer to --follow-symlinks option).
+ Object comparison:
+ 1) Groups
+ First compares the names of member objects (relative path, from the
+ specified group) and generates a report of objects that appear in only
+ one group or in both groups. Common objects are then compared recursively.
+ 2) Datasets
+ Array rank and dimensions, datatypes, and data values are compared.
+ 3) Datatypes
+ The comparison is based on the return value of H5Tequal.
+ 4) Symbolic links
+ The paths to the target objects are compared.
+ (The option --follow-symlinks overrides the default behavior when
+ symbolic links are compared.).
Exit code:
0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_623.txt b/tools/h5diff/testfiles/h5diff_623.txt
index f87d6db..2c15d98 100644
--- a/tools/h5diff/testfiles/h5diff_623.txt
+++ b/tools/h5diff/testfiles/h5diff_623.txt
@@ -1,5 +1,5 @@
<-n u> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
+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
@@ -70,16 +70,26 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
-v Verbose mode: print the above plus a list of objects and warnings
-q Quiet mode: do not print output
- Compare criteria
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
- with the same absolute path in both files
+ File comparison:
+ If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
+ a comparison of the two files' root groups. That is, h5diff first compares
+ the names of root group members, generates a report of root group objects
+ that appear in only one file or in both files, and recursively compares
+ common objects.
- The compare criteria is:
- 1) datasets: numerical array differences
- 2) groups: name string difference
- 3) datatypes: the return value of H5Tequal
- 4) links: name string difference of the linked value as default
- (refer to --follow-symlinks option).
+ Object comparison:
+ 1) Groups
+ First compares the names of member objects (relative path, from the
+ specified group) and generates a report of objects that appear in only
+ one group or in both groups. Common objects are then compared recursively.
+ 2) Datasets
+ Array rank and dimensions, datatypes, and data values are compared.
+ 3) Datatypes
+ The comparison is based on the return value of H5Tequal.
+ 4) Symbolic links
+ The paths to the target objects are compared.
+ (The option --follow-symlinks overrides the default behavior when
+ symbolic links are compared.).
Exit code:
0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_624.txt b/tools/h5diff/testfiles/h5diff_624.txt
index 4c9da26..272b9fc 100644
--- a/tools/h5diff/testfiles/h5diff_624.txt
+++ b/tools/h5diff/testfiles/h5diff_624.txt
@@ -1,5 +1,5 @@
<-n 0x1> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
+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
@@ -70,16 +70,26 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
-v Verbose mode: print the above plus a list of objects and warnings
-q Quiet mode: do not print output
- Compare criteria
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
- with the same absolute path in both files
+ File comparison:
+ If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as
+ a comparison of the two files' root groups. That is, h5diff first compares
+ the names of root group members, generates a report of root group objects
+ that appear in only one file or in both files, and recursively compares
+ common objects.
- The compare criteria is:
- 1) datasets: numerical array differences
- 2) groups: name string difference
- 3) datatypes: the return value of H5Tequal
- 4) links: name string difference of the linked value as default
- (refer to --follow-symlinks option).
+ Object comparison:
+ 1) Groups
+ First compares the names of member objects (relative path, from the
+ specified group) and generates a report of objects that appear in only
+ one group or in both groups. Common objects are then compared recursively.
+ 2) Datasets
+ Array rank and dimensions, datatypes, and data values are compared.
+ 3) Datatypes
+ The comparison is based on the return value of H5Tequal.
+ 4) Symbolic links
+ The paths to the target objects are compared.
+ (The option --follow-symlinks overrides the default behavior when
+ symbolic links are compared.).
Exit code:
0 if no differences, 1 if differences found, 2 if error
diff --git a/tools/h5diff/testfiles/h5diff_grp_recurse1.h5 b/tools/h5diff/testfiles/h5diff_grp_recurse1.h5
new file mode 100644
index 0000000..cfd4e62
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_grp_recurse1.h5
Binary files differ
diff --git a/tools/h5diff/testfiles/h5diff_grp_recurse2.h5 b/tools/h5diff/testfiles/h5diff_grp_recurse2.h5
new file mode 100644
index 0000000..54bcdec
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_grp_recurse2.h5
Binary files differ