diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-06 15:54:22 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-06 15:54:22 (GMT) |
| commit | 3bed8703631cbcffb215ccd82235fcc293e14218 (patch) | |
| tree | bf56b0bcd4f41986f17138059f6349df78f0c059 /tools/testfiles | |
| parent | 3eb8c81b8046d282ced9c2d94e7132058243013e (diff) | |
| download | hdf5-3bed8703631cbcffb215ccd82235fcc293e14218.zip hdf5-3bed8703631cbcffb215ccd82235fcc293e14218.tar.gz hdf5-3bed8703631cbcffb215ccd82235fcc293e14218.tar.bz2 | |
[svn-r14136] Description:
Move H5Gget_num_objs() and several minor macros, etc. to deprecated
symbols section, replacing it with H5Gget_info().
Tested on:
FreeBSD/32 6.2 (duty)
FreeBSD/64 6.2 (liberty)
Linux/32 2.6 (kagiso)
Linux/64 2.6 (smirom)
AIX/32 5.3 (copper)
Solaris/32 5.10 (linew)
Mac OS X/32 10.4.10 (amazon)
Diffstat (limited to 'tools/testfiles')
| -rw-r--r-- | tools/testfiles/h5diff_100.txt | 5 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_17.txt | 5 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_70.txt | 349 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_80.txt | 5 | ||||
| -rw-r--r-- | tools/testfiles/tcontents.ddl | 3 |
5 files changed, 186 insertions, 181 deletions
diff --git a/tools/testfiles/h5diff_100.txt b/tools/testfiles/h5diff_100.txt index a2186a7..5cf8868 100644 --- a/tools/testfiles/h5diff_100.txt +++ b/tools/testfiles/h5diff_100.txt @@ -4,8 +4,11 @@ Expected output for 'h5diff h5diff_hyper1.h5 h5diff_hyper2.h5 -v' file1 file2 --------------------------------------- + x x / x x /big +group : </> and </> +0 differences found dataset: </big> and </big> size: [1073741824] [1073741824] position big big difference @@ -1035,5 +1038,3 @@ position big big difference [ 268436478 ] 31 0 31 [ 268436479 ] 31 0 31 1024 differences found -group : </> and </> -0 differences found diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt index f7fff96..ec787b8 100644 --- a/tools/testfiles/h5diff_17.txt +++ b/tools/testfiles/h5diff_17.txt @@ -4,6 +4,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -v' file1 file2 --------------------------------------- + x x / x x /g1 x /g1/d1 x /g1/d2 @@ -23,6 +24,8 @@ file1 file2 x /g1/fp2 x /g2 +group : </> and </> +0 differences found group : </g1> and </g1> 0 differences found dataset: </g1/dset1> and </g1/dset1> @@ -35,5 +38,3 @@ position dset1 dset1 difference [ 1 1 ] 1 1.001 0.001 [ 2 1 ] 0 1 1 5 differences found -group : </> and </> -0 differences found diff --git a/tools/testfiles/h5diff_70.txt b/tools/testfiles/h5diff_70.txt index 3e7e37c..db01d50 100644 --- a/tools/testfiles/h5diff_70.txt +++ b/tools/testfiles/h5diff_70.txt @@ -4,63 +4,62 @@ Expected output for 'h5diff h5diff_attr1.h5 h5diff_attr2.h5 -v' file1 file2 --------------------------------------- + x x / x x /dset x x /g1 -dataset: </dset> and </dset> -</dset> or </dset> are empty datasets -attribute: <string of </dset>> and <string of </dset>> +group : </> and </> +0 differences found +attribute: <string of </>> and <string of </>> size: [2] [2] -position string of </dset> string of </dset> difference +position string of </> string of </> difference ------------------------------------------------------------ [ 0 ] a z [ 0 ] b z [ 1 ] d z [ 1 ] e z 4 differences found -attribute: <bitfield of </dset>> and <bitfield of </dset>> +attribute: <bitfield of </>> and <bitfield of </>> size: [2] [2] -position bitfield of </dset> bitfield of </dset> difference +position bitfield of </> bitfield of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: <opaque of </dset>> and <opaque of </dset>> +attribute: <opaque of </>> and <opaque of </>> size: [2] [2] -position opaque of </dset> opaque of </dset> difference +position opaque of </> opaque of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: <compound of </dset>> and <compound of </dset>> +attribute: <compound of </>> and <compound of </>> size: [2] [2] -position compound of </dset> compound of </dset> difference +position compound of </> compound of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 0 ] 2 0 2 [ 1 ] 3 0 3 [ 1 ] 4 0 4 4 differences found -attribute: <reference of </dset>> and <reference of </dset>> -0 differences found -attribute: <enum of </dset>> and <enum of </dset>> +attribute: <enum of </>> and <enum of </>> size: [2] [2] -position enum of </dset> enum of </dset> difference +position enum of </> enum of </> difference ------------------------------------------------------------ [ 0 ] RED GREEN [ 1 ] RED GREEN 2 differences found -attribute: <vlen of </dset>> and <vlen of </dset>> +attribute: <vlen of </>> and <vlen of </>> size: [2] [2] -position vlen of </dset> vlen of </dset> difference +position vlen of </> vlen of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 [ 1 ] 3 0 3 3 differences found -attribute: <array of </dset>> and <array of </dset>> +attribute: <array of </>> and <array of </>> size: [2] [2] -position array of </dset> array of </dset> difference +position array of </> array of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 0 ] 2 0 2 @@ -69,23 +68,23 @@ position array of </dset> array of </dset> difference [ 1 ] 5 0 5 [ 1 ] 6 0 6 6 differences found -attribute: <integer of </dset>> and <integer of </dset>> +attribute: <integer of </>> and <integer of </>> size: [2] [2] -position integer of </dset> integer of </dset> difference +position integer of </> integer of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: <float of </dset>> and <float of </dset>> +attribute: <float of </>> and <float of </>> size: [2] [2] -position float of </dset> float of </dset> difference +position float of </> float of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: <string2D of </dset>> and <string2D of </dset>> +attribute: <string2D of </>> and <string2D of </>> size: [3x2] [3x2] -position string2D of </dset> string2D of </dset> difference +position string2D of </> string2D of </> difference ------------------------------------------------------------ [ 0 0 ] a z [ 0 0 ] b z @@ -100,9 +99,9 @@ position string2D of </dset> string2D of </dset> difference [ 2 1 ] k z [ 2 1 ] l z 12 differences found -attribute: <bitfield2D of </dset>> and <bitfield2D of </dset>> +attribute: <bitfield2D of </>> and <bitfield2D of </>> size: [3x2] [3x2] -position bitfield2D of </dset> bitfield2D of </dset> difference +position bitfield2D of </> bitfield2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -111,9 +110,9 @@ position bitfield2D of </dset> bitfield2D of </dset> difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: <opaque2D of </dset>> and <opaque2D of </dset>> +attribute: <opaque2D of </>> and <opaque2D of </>> size: [3x2] [3x2] -position opaque2D of </dset> opaque2D of </dset> difference +position opaque2D of </> opaque2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -122,9 +121,9 @@ position opaque2D of </dset> opaque2D of </dset> difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: <compound2D of </dset>> and <compound2D of </dset>> +attribute: <compound2D of </>> and <compound2D of </>> size: [3x2] [3x2] -position compound2D of </dset> compound2D of </dset> difference +position compound2D of </> compound2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 0 ] 2 0 2 @@ -139,11 +138,9 @@ position compound2D of </dset> compound2D of </dset> difference [ 2 1 ] 11 0 11 [ 2 1 ] 12 0 12 12 differences found -attribute: <reference2D of </dset>> and <reference2D of </dset>> -0 differences found -attribute: <enum2D of </dset>> and <enum2D of </dset>> +attribute: <enum2D of </>> and <enum2D of </>> size: [3x2] [3x2] -position enum2D of </dset> enum2D of </dset> difference +position enum2D of </> enum2D of </> difference ------------------------------------------------------------ [ 0 0 ] RED GREEN [ 0 1 ] RED GREEN @@ -152,9 +149,9 @@ position enum2D of </dset> enum2D of </dset> difference [ 2 0 ] RED GREEN [ 2 1 ] RED GREEN 6 differences found -attribute: <vlen2D of </dset>> and <vlen2D of </dset>> +attribute: <vlen2D of </>> and <vlen2D of </>> size: [3x2] [3x2] -position vlen2D of </dset> vlen2D of </dset> difference +position vlen2D of </> vlen2D of </> difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 [ 1 0 ] 2 0 2 @@ -168,9 +165,9 @@ position vlen2D of </dset> vlen2D of </dset> difference [ 2 1 ] 10 0 10 [ 2 1 ] 11 0 11 11 differences found -attribute: <array2D of </dset>> and <array2D of </dset>> +attribute: <array2D of </>> and <array2D of </>> size: [3x2] [3x2] -position array2D of </dset> array2D of </dset> difference +position array2D of </> array2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 0 ] 2 0 2 @@ -191,9 +188,9 @@ position array2D of </dset> array2D of </dset> difference [ 2 1 ] 17 0 17 [ 2 1 ] 18 0 18 18 differences found -attribute: <integer2D of </dset>> and <integer2D of </dset>> +attribute: <integer2D of </>> and <integer2D of </>> size: [3x2] [3x2] -position integer2D of </dset> integer2D of </dset> difference +position integer2D of </> integer2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -202,9 +199,9 @@ position integer2D of </dset> integer2D of </dset> difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: <float2D of </dset>> and <float2D of </dset>> +attribute: <float2D of </>> and <float2D of </>> size: [3x2] [3x2] -position float2D of </dset> float2D of </dset> difference +position float2D of </> float2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -213,9 +210,9 @@ position float2D of </dset> float2D of </dset> difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: <string3D of </dset>> and <string3D of </dset>> +attribute: <string3D of </>> and <string3D of </>> size: [4x3x2] [4x3x2] -position string3D of </dset> string3D of </dset> difference +position string3D of </> string3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] a z [ 0 0 0 ] b z @@ -265,9 +262,9 @@ position string3D of </dset> string3D of </dset> difference [ 3 2 1 ] X z [ 3 2 1 ] Z z 47 differences found -attribute: <bitfield3D of </dset>> and <bitfield3D of </dset>> +attribute: <bitfield3D of </>> and <bitfield3D of </>> size: [4x3x2] [4x3x2] -position bitfield3D of </dset> bitfield3D of </dset> difference +position bitfield3D of </> bitfield3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -294,9 +291,9 @@ position bitfield3D of </dset> bitfield3D of </dset> difference [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -attribute: <opaque3D of </dset>> and <opaque3D of </dset>> +attribute: <opaque3D of </>> and <opaque3D of </>> size: [4x3x2] [4x3x2] -position opaque3D of </dset> opaque3D of </dset> difference +position opaque3D of </> opaque3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -323,9 +320,9 @@ position opaque3D of </dset> opaque3D of </dset> difference [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -attribute: <compound3D of </dset>> and <compound3D of </dset>> +attribute: <compound3D of </>> and <compound3D of </>> size: [4x3x2] [4x3x2] -position compound3D of </dset> compound3D of </dset> difference +position compound3D of </> compound3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 0 ] 2 0 2 @@ -376,11 +373,9 @@ position compound3D of </dset> compound3D of </dset> difference [ 3 2 1 ] 47 0 47 [ 3 2 1 ] 48 0 48 48 differences found -attribute: <reference3D of </dset>> and <reference3D of </dset>> -0 differences found -attribute: <enum3D of </dset>> and <enum3D of </dset>> +attribute: <enum3D of </>> and <enum3D of </>> size: [4x3x2] [4x3x2] -position enum3D of </dset> enum3D of </dset> difference +position enum3D of </> enum3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] GREEN RED [ 0 0 1 ] GREEN RED @@ -407,9 +402,9 @@ position enum3D of </dset> enum3D of </dset> difference [ 3 2 0 ] GREEN RED [ 3 2 1 ] GREEN RED 24 differences found -attribute: <vlen3D of </dset>> and <vlen3D of </dset>> +attribute: <vlen3D of </>> and <vlen3D of </>> size: [4x3x2] [4x3x2] -position vlen3D of </dset> vlen3D of </dset> difference +position vlen3D of </> vlen3D of </> difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 [ 0 1 0 ] 2 0 2 @@ -471,9 +466,9 @@ position vlen3D of </dset> vlen3D of </dset> difference [ 3 2 1 ] 58 0 58 [ 3 2 1 ] 59 0 59 59 differences found -attribute: <array3D of </dset>> and <array3D of </dset>> +attribute: <array3D of </>> and <array3D of </>> size: [4x3x2] [4x3x2] -position array3D of </dset> array3D of </dset> difference +position array3D of </> array3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 0 ] 2 0 2 @@ -548,9 +543,9 @@ position array3D of </dset> array3D of </dset> difference [ 3 2 1 ] 71 0 71 [ 3 2 1 ] 72 0 72 72 differences found -attribute: <integer3D of </dset>> and <integer3D of </dset>> +attribute: <integer3D of </>> and <integer3D of </>> size: [4x3x2] [4x3x2] -position integer3D of </dset> integer3D of </dset> difference +position integer3D of </> integer3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -577,9 +572,9 @@ position integer3D of </dset> integer3D of </dset> difference [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -attribute: <float3D of </dset>> and <float3D of </dset>> +attribute: <float3D of </>> and <float3D of </>> size: [4x3x2] [4x3x2] -position float3D of </dset> float3D of </dset> difference +position float3D of </> float3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -606,59 +601,60 @@ position float3D of </dset> float3D of </dset> difference [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -456 differences found -group : </g1> and </g1> -0 differences found -attribute: <string of </g1>> and <string of </g1>> +dataset: </dset> and </dset> +</dset> or </dset> are empty datasets +attribute: <string of </dset>> and <string of </dset>> size: [2] [2] -position string of </g1> string of </g1> difference +position string of </dset> string of </dset> difference ------------------------------------------------------------ [ 0 ] a z [ 0 ] b z [ 1 ] d z [ 1 ] e z 4 differences found -attribute: <bitfield of </g1>> and <bitfield of </g1>> +attribute: <bitfield of </dset>> and <bitfield of </dset>> size: [2] [2] -position bitfield of </g1> bitfield of </g1> difference +position bitfield of </dset> bitfield of </dset> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: <opaque of </g1>> and <opaque of </g1>> +attribute: <opaque of </dset>> and <opaque of </dset>> size: [2] [2] -position opaque of </g1> opaque of </g1> difference +position opaque of </dset> opaque of </dset> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: <compound of </g1>> and <compound of </g1>> +attribute: <compound of </dset>> and <compound of </dset>> size: [2] [2] -position compound of </g1> compound of </g1> difference +position compound of </dset> compound of </dset> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 0 ] 2 0 2 [ 1 ] 3 0 3 [ 1 ] 4 0 4 4 differences found -attribute: <enum of </g1>> and <enum of </g1>> +attribute: <reference of </dset>> and <reference of </dset>> +0 differences found +attribute: <enum of </dset>> and <enum of </dset>> size: [2] [2] -position enum of </g1> enum of </g1> difference +position enum of </dset> enum of </dset> difference ------------------------------------------------------------ [ 0 ] RED GREEN [ 1 ] RED GREEN 2 differences found -attribute: <vlen of </g1>> and <vlen of </g1>> +attribute: <vlen of </dset>> and <vlen of </dset>> size: [2] [2] -position vlen of </g1> vlen of </g1> difference +position vlen of </dset> vlen of </dset> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 [ 1 ] 3 0 3 3 differences found -attribute: <array of </g1>> and <array of </g1>> +attribute: <array of </dset>> and <array of </dset>> size: [2] [2] -position array of </g1> array of </g1> difference +position array of </dset> array of </dset> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 0 ] 2 0 2 @@ -667,23 +663,23 @@ position array of </g1> array of </g1> difference [ 1 ] 5 0 5 [ 1 ] 6 0 6 6 differences found -attribute: <integer of </g1>> and <integer of </g1>> +attribute: <integer of </dset>> and <integer of </dset>> size: [2] [2] -position integer of </g1> integer of </g1> difference +position integer of </dset> integer of </dset> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: <float of </g1>> and <float of </g1>> +attribute: <float of </dset>> and <float of </dset>> size: [2] [2] -position float of </g1> float of </g1> difference +position float of </dset> float of </dset> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: <string2D of </g1>> and <string2D of </g1>> +attribute: <string2D of </dset>> and <string2D of </dset>> size: [3x2] [3x2] -position string2D of </g1> string2D of </g1> difference +position string2D of </dset> string2D of </dset> difference ------------------------------------------------------------ [ 0 0 ] a z [ 0 0 ] b z @@ -698,9 +694,9 @@ position string2D of </g1> string2D of </g1> difference [ 2 1 ] k z [ 2 1 ] l z 12 differences found -attribute: <bitfield2D of </g1>> and <bitfield2D of </g1>> +attribute: <bitfield2D of </dset>> and <bitfield2D of </dset>> size: [3x2] [3x2] -position bitfield2D of </g1> bitfield2D of </g1> difference +position bitfield2D of </dset> bitfield2D of </dset> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -709,9 +705,9 @@ position bitfield2D of </g1> bitfield2D of </g1> difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: <opaque2D of </g1>> and <opaque2D of </g1>> +attribute: <opaque2D of </dset>> and <opaque2D of </dset>> size: [3x2] [3x2] -position opaque2D of </g1> opaque2D of </g1> difference +position opaque2D of </dset> opaque2D of </dset> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -720,9 +716,9 @@ position opaque2D of </g1> opaque2D of </g1> difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: <compound2D of </g1>> and <compound2D of </g1>> +attribute: <compound2D of </dset>> and <compound2D of </dset>> size: [3x2] [3x2] -position compound2D of </g1> compound2D of </g1> difference +position compound2D of </dset> compound2D of </dset> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 0 ] 2 0 2 @@ -737,9 +733,11 @@ position compound2D of </g1> compound2D of </g1> difference [ 2 1 ] 11 0 11 [ 2 1 ] 12 0 12 12 differences found -attribute: <enum2D of </g1>> and <enum2D of </g1>> +attribute: <reference2D of </dset>> and <reference2D of </dset>> +0 differences found +attribute: <enum2D of </dset>> and <enum2D of </dset>> size: [3x2] [3x2] -position enum2D of </g1> enum2D of </g1> difference +position enum2D of </dset> enum2D of </dset> difference ------------------------------------------------------------ [ 0 0 ] RED GREEN [ 0 1 ] RED GREEN @@ -748,9 +746,9 @@ position enum2D of </g1> enum2D of </g1> difference [ 2 0 ] RED GREEN [ 2 1 ] RED GREEN 6 differences found -attribute: <vlen2D of </g1>> and <vlen2D of </g1>> +attribute: <vlen2D of </dset>> and <vlen2D of </dset>> size: [3x2] [3x2] -position vlen2D of </g1> vlen2D of </g1> difference +position vlen2D of </dset> vlen2D of </dset> difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 [ 1 0 ] 2 0 2 @@ -764,9 +762,9 @@ position vlen2D of </g1> vlen2D of </g1> difference [ 2 1 ] 10 0 10 [ 2 1 ] 11 0 11 11 differences found -attribute: <array2D of </g1>> and <array2D of </g1>> +attribute: <array2D of </dset>> and <array2D of </dset>> size: [3x2] [3x2] -position array2D of </g1> array2D of </g1> difference +position array2D of </dset> array2D of </dset> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 0 ] 2 0 2 @@ -787,9 +785,9 @@ position array2D of </g1> array2D of </g1> difference [ 2 1 ] 17 0 17 [ 2 1 ] 18 0 18 18 differences found -attribute: <integer2D of </g1>> and <integer2D of </g1>> +attribute: <integer2D of </dset>> and <integer2D of </dset>> size: [3x2] [3x2] -position integer2D of </g1> integer2D of </g1> difference +position integer2D of </dset> integer2D of </dset> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -798,9 +796,9 @@ position integer2D of </g1> integer2D of </g1> difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: <float2D of </g1>> and <float2D of </g1>> +attribute: <float2D of </dset>> and <float2D of </dset>> size: [3x2] [3x2] -position float2D of </g1> float2D of </g1> difference +position float2D of </dset> float2D of </dset> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -809,9 +807,9 @@ position float2D of </g1> float2D of </g1> difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: <string3D of </g1>> and <string3D of </g1>> +attribute: <string3D of </dset>> and <string3D of </dset>> size: [4x3x2] [4x3x2] -position string3D of </g1> string3D of </g1> difference +position string3D of </dset> string3D of </dset> difference ------------------------------------------------------------ [ 0 0 0 ] a z [ 0 0 0 ] b z @@ -861,9 +859,9 @@ position string3D of </g1> string3D of </g1> difference [ 3 2 1 ] X z [ 3 2 1 ] Z z 47 differences found -attribute: <bitfield3D of </g1>> and <bitfield3D of </g1>> +attribute: <bitfield3D of </dset>> and <bitfield3D of </dset>> size: [4x3x2] [4x3x2] -position bitfield3D of </g1> bitfield3D of </g1> difference +position bitfield3D of </dset> bitfield3D of </dset> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -890,9 +888,9 @@ position bitfield3D of </g1> bitfield3D of </g1> difference [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -attribute: <opaque3D of </g1>> and <opaque3D of </g1>> +attribute: <opaque3D of </dset>> and <opaque3D of </dset>> size: [4x3x2] [4x3x2] -position opaque3D of </g1> opaque3D of </g1> difference +position opaque3D of </dset> opaque3D of </dset> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -919,9 +917,9 @@ position opaque3D of </g1> opaque3D of </g1> difference [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -attribute: <compound3D of </g1>> and <compound3D of </g1>> +attribute: <compound3D of </dset>> and <compound3D of </dset>> size: [4x3x2] [4x3x2] -position compound3D of </g1> compound3D of </g1> difference +position compound3D of </dset> compound3D of </dset> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 0 ] 2 0 2 @@ -972,9 +970,11 @@ position compound3D of </g1> compound3D of </g1> difference [ 3 2 1 ] 47 0 47 [ 3 2 1 ] 48 0 48 48 differences found -attribute: <enum3D of </g1>> and <enum3D of </g1>> +attribute: <reference3D of </dset>> and <reference3D of </dset>> +0 differences found +attribute: <enum3D of </dset>> and <enum3D of </dset>> size: [4x3x2] [4x3x2] -position enum3D of </g1> enum3D of </g1> difference +position enum3D of </dset> enum3D of </dset> difference ------------------------------------------------------------ [ 0 0 0 ] GREEN RED [ 0 0 1 ] GREEN RED @@ -1001,9 +1001,9 @@ position enum3D of </g1> enum3D of </g1> difference [ 3 2 0 ] GREEN RED [ 3 2 1 ] GREEN RED 24 differences found -attribute: <vlen3D of </g1>> and <vlen3D of </g1>> +attribute: <vlen3D of </dset>> and <vlen3D of </dset>> size: [4x3x2] [4x3x2] -position vlen3D of </g1> vlen3D of </g1> difference +position vlen3D of </dset> vlen3D of </dset> difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 [ 0 1 0 ] 2 0 2 @@ -1065,9 +1065,9 @@ position vlen3D of </g1> vlen3D of </g1> difference [ 3 2 1 ] 58 0 58 [ 3 2 1 ] 59 0 59 59 differences found -attribute: <array3D of </g1>> and <array3D of </g1>> +attribute: <array3D of </dset>> and <array3D of </dset>> size: [4x3x2] [4x3x2] -position array3D of </g1> array3D of </g1> difference +position array3D of </dset> array3D of </dset> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 0 ] 2 0 2 @@ -1142,9 +1142,9 @@ position array3D of </g1> array3D of </g1> difference [ 3 2 1 ] 71 0 71 [ 3 2 1 ] 72 0 72 72 differences found -attribute: <integer3D of </g1>> and <integer3D of </g1>> +attribute: <integer3D of </dset>> and <integer3D of </dset>> size: [4x3x2] [4x3x2] -position integer3D of </g1> integer3D of </g1> difference +position integer3D of </dset> integer3D of </dset> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -1171,9 +1171,9 @@ position integer3D of </g1> integer3D of </g1> difference [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -attribute: <float3D of </g1>> and <float3D of </g1>> +attribute: <float3D of </dset>> and <float3D of </dset>> size: [4x3x2] [4x3x2] -position float3D of </g1> float3D of </g1> difference +position float3D of </dset> float3D of </dset> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -1200,58 +1200,59 @@ position float3D of </g1> float3D of </g1> difference [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -group : </> and </> +456 differences found +group : </g1> and </g1> 0 differences found -attribute: <string of </>> and <string of </>> +attribute: <string of </g1>> and <string of </g1>> size: [2] [2] -position string of </> string of </> difference +position string of </g1> string of </g1> difference ------------------------------------------------------------ [ 0 ] a z [ 0 ] b z [ 1 ] d z [ 1 ] e z 4 differences found -attribute: <bitfield of </>> and <bitfield of </>> +attribute: <bitfield of </g1>> and <bitfield of </g1>> size: [2] [2] -position bitfield of </> bitfield of </> difference +position bitfield of </g1> bitfield of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: <opaque of </>> and <opaque of </>> +attribute: <opaque of </g1>> and <opaque of </g1>> size: [2] [2] -position opaque of </> opaque of </> difference +position opaque of </g1> opaque of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: <compound of </>> and <compound of </>> +attribute: <compound of </g1>> and <compound of </g1>> size: [2] [2] -position compound of </> compound of </> difference +position compound of </g1> compound of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 0 ] 2 0 2 [ 1 ] 3 0 3 [ 1 ] 4 0 4 4 differences found -attribute: <enum of </>> and <enum of </>> +attribute: <enum of </g1>> and <enum of </g1>> size: [2] [2] -position enum of </> enum of </> difference +position enum of </g1> enum of </g1> difference ------------------------------------------------------------ [ 0 ] RED GREEN [ 1 ] RED GREEN 2 differences found -attribute: <vlen of </>> and <vlen of </>> +attribute: <vlen of </g1>> and <vlen of </g1>> size: [2] [2] -position vlen of </> vlen of </> difference +position vlen of </g1> vlen of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 [ 1 ] 3 0 3 3 differences found -attribute: <array of </>> and <array of </>> +attribute: <array of </g1>> and <array of </g1>> size: [2] [2] -position array of </> array of </> difference +position array of </g1> array of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 0 ] 2 0 2 @@ -1260,23 +1261,23 @@ position array of </> array of </> difference [ 1 ] 5 0 5 [ 1 ] 6 0 6 6 differences found -attribute: <integer of </>> and <integer of </>> +attribute: <integer of </g1>> and <integer of </g1>> size: [2] [2] -position integer of </> integer of </> difference +position integer of </g1> integer of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: <float of </>> and <float of </>> +attribute: <float of </g1>> and <float of </g1>> size: [2] [2] -position float of </> float of </> difference +position float of </g1> float of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found -attribute: <string2D of </>> and <string2D of </>> +attribute: <string2D of </g1>> and <string2D of </g1>> size: [3x2] [3x2] -position string2D of </> string2D of </> difference +position string2D of </g1> string2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] a z [ 0 0 ] b z @@ -1291,9 +1292,9 @@ position string2D of </> string2D of </> difference [ 2 1 ] k z [ 2 1 ] l z 12 differences found -attribute: <bitfield2D of </>> and <bitfield2D of </>> +attribute: <bitfield2D of </g1>> and <bitfield2D of </g1>> size: [3x2] [3x2] -position bitfield2D of </> bitfield2D of </> difference +position bitfield2D of </g1> bitfield2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -1302,9 +1303,9 @@ position bitfield2D of </> bitfield2D of </> difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: <opaque2D of </>> and <opaque2D of </>> +attribute: <opaque2D of </g1>> and <opaque2D of </g1>> size: [3x2] [3x2] -position opaque2D of </> opaque2D of </> difference +position opaque2D of </g1> opaque2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -1313,9 +1314,9 @@ position opaque2D of </> opaque2D of </> difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: <compound2D of </>> and <compound2D of </>> +attribute: <compound2D of </g1>> and <compound2D of </g1>> size: [3x2] [3x2] -position compound2D of </> compound2D of </> difference +position compound2D of </g1> compound2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 0 ] 2 0 2 @@ -1330,9 +1331,9 @@ position compound2D of </> compound2D of </> difference [ 2 1 ] 11 0 11 [ 2 1 ] 12 0 12 12 differences found -attribute: <enum2D of </>> and <enum2D of </>> +attribute: <enum2D of </g1>> and <enum2D of </g1>> size: [3x2] [3x2] -position enum2D of </> enum2D of </> difference +position enum2D of </g1> enum2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] RED GREEN [ 0 1 ] RED GREEN @@ -1341,9 +1342,9 @@ position enum2D of </> enum2D of </> difference [ 2 0 ] RED GREEN [ 2 1 ] RED GREEN 6 differences found -attribute: <vlen2D of </>> and <vlen2D of </>> +attribute: <vlen2D of </g1>> and <vlen2D of </g1>> size: [3x2] [3x2] -position vlen2D of </> vlen2D of </> difference +position vlen2D of </g1> vlen2D of </g1> difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 [ 1 0 ] 2 0 2 @@ -1357,9 +1358,9 @@ position vlen2D of </> vlen2D of </> difference [ 2 1 ] 10 0 10 [ 2 1 ] 11 0 11 11 differences found -attribute: <array2D of </>> and <array2D of </>> +attribute: <array2D of </g1>> and <array2D of </g1>> size: [3x2] [3x2] -position array2D of </> array2D of </> difference +position array2D of </g1> array2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 0 ] 2 0 2 @@ -1380,9 +1381,9 @@ position array2D of </> array2D of </> difference [ 2 1 ] 17 0 17 [ 2 1 ] 18 0 18 18 differences found -attribute: <integer2D of </>> and <integer2D of </>> +attribute: <integer2D of </g1>> and <integer2D of </g1>> size: [3x2] [3x2] -position integer2D of </> integer2D of </> difference +position integer2D of </g1> integer2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -1391,9 +1392,9 @@ position integer2D of </> integer2D of </> difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: <float2D of </>> and <float2D of </>> +attribute: <float2D of </g1>> and <float2D of </g1>> size: [3x2] [3x2] -position float2D of </> float2D of </> difference +position float2D of </g1> float2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 [ 0 1 ] 2 0 2 @@ -1402,9 +1403,9 @@ position float2D of </> float2D of </> difference [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 6 differences found -attribute: <string3D of </>> and <string3D of </>> +attribute: <string3D of </g1>> and <string3D of </g1>> size: [4x3x2] [4x3x2] -position string3D of </> string3D of </> difference +position string3D of </g1> string3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] a z [ 0 0 0 ] b z @@ -1454,9 +1455,9 @@ position string3D of </> string3D of </> difference [ 3 2 1 ] X z [ 3 2 1 ] Z z 47 differences found -attribute: <bitfield3D of </>> and <bitfield3D of </>> +attribute: <bitfield3D of </g1>> and <bitfield3D of </g1>> size: [4x3x2] [4x3x2] -position bitfield3D of </> bitfield3D of </> difference +position bitfield3D of </g1> bitfield3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -1483,9 +1484,9 @@ position bitfield3D of </> bitfield3D of </> difference [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -attribute: <opaque3D of </>> and <opaque3D of </>> +attribute: <opaque3D of </g1>> and <opaque3D of </g1>> size: [4x3x2] [4x3x2] -position opaque3D of </> opaque3D of </> difference +position opaque3D of </g1> opaque3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -1512,9 +1513,9 @@ position opaque3D of </> opaque3D of </> difference [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -attribute: <compound3D of </>> and <compound3D of </>> +attribute: <compound3D of </g1>> and <compound3D of </g1>> size: [4x3x2] [4x3x2] -position compound3D of </> compound3D of </> difference +position compound3D of </g1> compound3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 0 ] 2 0 2 @@ -1565,9 +1566,9 @@ position compound3D of </> compound3D of </> difference [ 3 2 1 ] 47 0 47 [ 3 2 1 ] 48 0 48 48 differences found -attribute: <enum3D of </>> and <enum3D of </>> +attribute: <enum3D of </g1>> and <enum3D of </g1>> size: [4x3x2] [4x3x2] -position enum3D of </> enum3D of </> difference +position enum3D of </g1> enum3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] GREEN RED [ 0 0 1 ] GREEN RED @@ -1594,9 +1595,9 @@ position enum3D of </> enum3D of </> difference [ 3 2 0 ] GREEN RED [ 3 2 1 ] GREEN RED 24 differences found -attribute: <vlen3D of </>> and <vlen3D of </>> +attribute: <vlen3D of </g1>> and <vlen3D of </g1>> size: [4x3x2] [4x3x2] -position vlen3D of </> vlen3D of </> difference +position vlen3D of </g1> vlen3D of </g1> difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 [ 0 1 0 ] 2 0 2 @@ -1658,9 +1659,9 @@ position vlen3D of </> vlen3D of </> difference [ 3 2 1 ] 58 0 58 [ 3 2 1 ] 59 0 59 59 differences found -attribute: <array3D of </>> and <array3D of </>> +attribute: <array3D of </g1>> and <array3D of </g1>> size: [4x3x2] [4x3x2] -position array3D of </> array3D of </> difference +position array3D of </g1> array3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 0 ] 2 0 2 @@ -1735,9 +1736,9 @@ position array3D of </> array3D of </> difference [ 3 2 1 ] 71 0 71 [ 3 2 1 ] 72 0 72 72 differences found -attribute: <integer3D of </>> and <integer3D of </>> +attribute: <integer3D of </g1>> and <integer3D of </g1>> size: [4x3x2] [4x3x2] -position integer3D of </> integer3D of </> difference +position integer3D of </g1> integer3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 @@ -1764,9 +1765,9 @@ position integer3D of </> integer3D of </> difference [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 24 differences found -attribute: <float3D of </>> and <float3D of </>> +attribute: <float3D of </g1>> and <float3D of </g1>> size: [4x3x2] [4x3x2] -position float3D of </> float3D of </> difference +position float3D of </g1> float3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 [ 0 0 1 ] 2 0 2 diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt index 9e31e88..0093870 100644 --- a/tools/testfiles/h5diff_80.txt +++ b/tools/testfiles/h5diff_80.txt @@ -4,6 +4,7 @@ Expected output for 'h5diff h5diff_dset1.h5 h5diff_dset2.h5 -v' file1 file2 --------------------------------------- + x x / x x /dset x x /dsetref x x /g1 @@ -39,6 +40,8 @@ file1 file2 x x /g1/vlen3D x x /refreg +group : </> and </> +0 differences found dataset: </dset> and </dset> size: [2] [2] position dset dset difference @@ -782,8 +785,6 @@ point #1 (2,2) (3,3) point #3 (1,6) (2,5) point #4 (2,8) (1,7) 4 differences found -group : </> and </> -0 differences found -------------------------------- Some objects are not comparable -------------------------------- diff --git a/tools/testfiles/tcontents.ddl b/tools/testfiles/tcontents.ddl index 905bac5..2bb59b9 100644 --- a/tools/testfiles/tcontents.ddl +++ b/tools/testfiles/tcontents.ddl @@ -4,6 +4,7 @@ Expected output for 'h5dump -n tfcontents1.h5' HDF5 "tfcontents1.h5" { FILE_CONTENTS { datatype /#5616 + group / dataset /dset dataset /dset3 -> /dset dataset /dset4 -> /dset @@ -17,6 +18,6 @@ FILE_CONTENTS { link /mylink -> mylink datatype /mytype link /softlink -> /dset - UD link type /udlink -> + unknown type of UD link /udlink -> ??? } } |