diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2004-07-20 19:21:03 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2004-07-20 19:21:03 (GMT) |
| commit | 4cb6c01d7f59be968649e36a61346be044f76345 (patch) | |
| tree | e0a0b81e542768b75d5bbb2de8afc1abfb8c4370 /tools/testfiles/h5diff_70.txt | |
| parent | 00909f278d64017c21c8348537231daba97be9dd (diff) | |
| download | hdf5-4cb6c01d7f59be968649e36a61346be044f76345.zip hdf5-4cb6c01d7f59be968649e36a61346be044f76345.tar.gz hdf5-4cb6c01d7f59be968649e36a61346be044f76345.tar.bz2 | |
[svn-r8904] Purpose:
h5diff and h5repack changes
Description:
h5diff
introduced the following four modes of output:
Normal mode: print the number of differences found and where they occured
Report mode: print the above plus the differences
Verbose mode: print the above plus a list of objects and warnings
Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
h5repack
added an extra parameter for SZIP filter (coding method)
the new syntax is
-f SZIP=<pixels per block,coding>
(pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN')
Example of use:
./h5repack -i file1 -o file2 -f SZIP=8,NN -v
updated usage messages, test scripts and files accordingly
Solution:
Platforms tested:
linux
AIX
solaris
Misc. update:
Diffstat (limited to 'tools/testfiles/h5diff_70.txt')
| -rw-r--r-- | tools/testfiles/h5diff_70.txt | 121 |
1 files changed, 120 insertions, 1 deletions
diff --git a/tools/testfiles/h5diff_70.txt b/tools/testfiles/h5diff_70.txt index a0413de..0fc1e09 100644 --- a/tools/testfiles/h5diff_70.txt +++ b/tools/testfiles/h5diff_70.txt @@ -1,35 +1,56 @@ ############################# -Expected output for 'h5diff file5.h5 file6.h5' +Expected output for 'h5diff file5.h5 file6.h5 -v' ############################# + +file1 file2 +--------------------------------------- + x x /dset + x x /g1 + +</dset> and </dset> are empty datasets +Dataset: </dset> and </dset> +Group: </g1> and </g1> position string of </g1> string of </g1> difference ------------------------------------------------------------ [ 0 ] a z [ 0 ] b z [ 1 ] d z [ 1 ] e z +Attribute: <string of </g1>> and <string of </g1>> +4 differences found position bitfield of </g1> bitfield of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +Attribute: <bitfield of </g1>> and <bitfield of </g1>> +2 differences found position opaque of </g1> opaque of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +Attribute: <opaque of </g1>> and <opaque of </g1>> +2 differences found position compound of </g1> compound of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 0 ] 2.000000 0.000000 2.000000 [ 1 ] 3 0 3 [ 1 ] 4.000000 0.000000 4.000000 +Attribute: <compound of </g1>> and <compound of </g1>> +4 differences found position enum of </g1> enum of </g1> difference ------------------------------------------------------------ [ 0 ] RED GREEN [ 1 ] RED GREEN +Attribute: <enum of </g1>> and <enum of </g1>> +2 differences found position vlen of </g1> vlen of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 [ 1 ] 3 0 3 +Attribute: <vlen of </g1>> and <vlen of </g1>> +3 differences found position array of </g1> array of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -38,14 +59,20 @@ position array of </g1> array of </g1> difference [ 1 ] 4 0 4 [ 1 ] 5 0 5 [ 1 ] 6 0 6 +Attribute: <array of </g1>> and <array of </g1>> +6 differences found position integer of </g1> integer of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +Attribute: <integer of </g1>> and <integer of </g1>> +2 differences found position float of </g1> float of </g1> difference ------------------------------------------------------------ [ 0 ] 1.000000 0.000000 1.000000 [ 1 ] 2.000000 0.000000 2.000000 +Attribute: <float of </g1>> and <float of </g1>> +2 differences found position string2D of </g1> string2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] a z @@ -60,6 +87,8 @@ position string2D of </g1> string2D of </g1> difference [ 2 0 ] j z [ 2 1 ] k z [ 2 1 ] l z +Attribute: <string2D of </g1>> and <string2D of </g1>> +12 differences found position bitfield2D of </g1> bitfield2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -68,6 +97,8 @@ position bitfield2D of </g1> bitfield2D of </g1> difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 +Attribute: <bitfield2D of </g1>> and <bitfield2D of </g1>> +6 differences found position opaque2D of </g1> opaque2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -76,6 +107,8 @@ position opaque2D of </g1> opaque2D of </g1> difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 +Attribute: <opaque2D of </g1>> and <opaque2D of </g1>> +6 differences found position compound2D of </g1> compound2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -90,6 +123,8 @@ position compound2D of </g1> compound2D of </g1> difference [ 2 0 ] 10.000000 0.000000 10.000000 [ 2 1 ] 11 0 11 [ 2 1 ] 12.000000 0.000000 12.000000 +Attribute: <compound2D of </g1>> and <compound2D of </g1>> +12 differences found position enum2D of </g1> enum2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] RED GREEN @@ -98,6 +133,8 @@ position enum2D of </g1> enum2D of </g1> difference [ 1 1 ] RED GREEN [ 2 0 ] RED GREEN [ 2 1 ] RED GREEN +Attribute: <enum2D of </g1>> and <enum2D of </g1>> +6 differences found position vlen2D of </g1> vlen2D of </g1> difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 @@ -111,6 +148,8 @@ position vlen2D of </g1> vlen2D of </g1> difference [ 2 1 ] 9 0 9 [ 2 1 ] 10 0 10 [ 2 1 ] 11 0 11 +Attribute: <vlen2D of </g1>> and <vlen2D of </g1>> +11 differences found position array2D of </g1> array2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -131,6 +170,8 @@ position array2D of </g1> array2D of </g1> difference [ 2 1 ] 16 0 16 [ 2 1 ] 17 0 17 [ 2 1 ] 18 0 18 +Attribute: <array2D of </g1>> and <array2D of </g1>> +18 differences found position integer2D of </g1> integer2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -139,6 +180,8 @@ position integer2D of </g1> integer2D of </g1> difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 +Attribute: <integer2D of </g1>> and <integer2D of </g1>> +6 differences found position float2D of </g1> float2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1.000000 0.000000 1.000000 @@ -147,6 +190,8 @@ position float2D of </g1> float2D of </g1> difference [ 1 1 ] 4.000000 0.000000 4.000000 [ 2 0 ] 5.000000 0.000000 5.000000 [ 2 1 ] 6.000000 0.000000 6.000000 +Attribute: <float2D of </g1>> and <float2D of </g1>> +6 differences found position string3D of </g1> string3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] a z @@ -196,6 +241,8 @@ position string3D of </g1> string3D of </g1> difference [ 3 2 0 ] W z [ 3 2 1 ] X z [ 3 2 1 ] Z z +Attribute: <string3D of </g1>> and <string3D of </g1>> +47 differences found position bitfield3D of </g1> bitfield3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -222,6 +269,8 @@ position bitfield3D of </g1> bitfield3D of </g1> difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 +Attribute: <bitfield3D of </g1>> and <bitfield3D of </g1>> +24 differences found position opaque3D of </g1> opaque3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -248,6 +297,8 @@ position opaque3D of </g1> opaque3D of </g1> difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 +Attribute: <opaque3D of </g1>> and <opaque3D of </g1>> +24 differences found position compound3D of </g1> compound3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -298,6 +349,8 @@ position compound3D of </g1> compound3D of </g1> difference [ 3 2 0 ] 46.000000 0.000000 46.000000 [ 3 2 1 ] 47 0 47 [ 3 2 1 ] 48.000000 0.000000 48.000000 +Attribute: <compound3D of </g1>> and <compound3D of </g1>> +48 differences found position enum3D of </g1> enum3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] GREEN RED @@ -324,6 +377,8 @@ position enum3D of </g1> enum3D of </g1> difference [ 3 1 1 ] GREEN RED [ 3 2 0 ] GREEN RED [ 3 2 1 ] GREEN RED +Attribute: <enum3D of </g1>> and <enum3D of </g1>> +24 differences found position vlen3D of </g1> vlen3D of </g1> difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 @@ -385,6 +440,8 @@ position vlen3D of </g1> vlen3D of </g1> difference [ 3 2 1 ] 57 0 57 [ 3 2 1 ] 58 0 58 [ 3 2 1 ] 59 0 59 +Attribute: <vlen3D of </g1>> and <vlen3D of </g1>> +59 differences found position array3D of </g1> array3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -459,6 +516,8 @@ position array3D of </g1> array3D of </g1> difference [ 3 2 1 ] 70 0 70 [ 3 2 1 ] 71 0 71 [ 3 2 1 ] 72 0 72 +Attribute: <array3D of </g1>> and <array3D of </g1>> +72 differences found position integer3D of </g1> integer3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -485,6 +544,8 @@ position integer3D of </g1> integer3D of </g1> difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 +Attribute: <integer3D of </g1>> and <integer3D of </g1>> +24 differences found position float3D of </g1> float3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1.000000 0.000000 1.000000 @@ -511,35 +572,50 @@ position float3D of </g1> float3D of </g1> difference [ 3 1 1 ] 22.000000 0.000000 22.000000 [ 3 2 0 ] 23.000000 0.000000 23.000000 [ 3 2 1 ] 24.000000 0.000000 24.000000 +Attribute: <float3D of </g1>> and <float3D of </g1>> +24 differences found +Group: </> and </> position string of </> string of </> difference ------------------------------------------------------------ [ 0 ] a z [ 0 ] b z [ 1 ] d z [ 1 ] e z +Attribute: <string of </>> and <string of </>> +4 differences found position bitfield of </> bitfield of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +Attribute: <bitfield of </>> and <bitfield of </>> +2 differences found position opaque of </> opaque of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +Attribute: <opaque of </>> and <opaque of </>> +2 differences found position compound of </> compound of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 0 ] 2.000000 0.000000 2.000000 [ 1 ] 3 0 3 [ 1 ] 4.000000 0.000000 4.000000 +Attribute: <compound of </>> and <compound of </>> +4 differences found position enum of </> enum of </> difference ------------------------------------------------------------ [ 0 ] RED GREEN [ 1 ] RED GREEN +Attribute: <enum of </>> and <enum of </>> +2 differences found position vlen of </> vlen of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 [ 1 ] 3 0 3 +Attribute: <vlen of </>> and <vlen of </>> +3 differences found position array of </> array of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -548,14 +624,20 @@ position array of </> array of </> difference [ 1 ] 4 0 4 [ 1 ] 5 0 5 [ 1 ] 6 0 6 +Attribute: <array of </>> and <array of </>> +6 differences found position integer of </> integer of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +Attribute: <integer of </>> and <integer of </>> +2 differences found position float of </> float of </> difference ------------------------------------------------------------ [ 0 ] 1.000000 0.000000 1.000000 [ 1 ] 2.000000 0.000000 2.000000 +Attribute: <float of </>> and <float of </>> +2 differences found position string2D of </> string2D of </> difference ------------------------------------------------------------ [ 0 0 ] a z @@ -570,6 +652,8 @@ position string2D of </> string2D of </> difference [ 2 0 ] j z [ 2 1 ] k z [ 2 1 ] l z +Attribute: <string2D of </>> and <string2D of </>> +12 differences found position bitfield2D of </> bitfield2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -578,6 +662,8 @@ position bitfield2D of </> bitfield2D of </> difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 +Attribute: <bitfield2D of </>> and <bitfield2D of </>> +6 differences found position opaque2D of </> opaque2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -586,6 +672,8 @@ position opaque2D of </> opaque2D of </> difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 +Attribute: <opaque2D of </>> and <opaque2D of </>> +6 differences found position compound2D of </> compound2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -600,6 +688,8 @@ position compound2D of </> compound2D of </> difference [ 2 0 ] 10.000000 0.000000 10.000000 [ 2 1 ] 11 0 11 [ 2 1 ] 12.000000 0.000000 12.000000 +Attribute: <compound2D of </>> and <compound2D of </>> +12 differences found position enum2D of </> enum2D of </> difference ------------------------------------------------------------ [ 0 0 ] RED GREEN @@ -608,6 +698,8 @@ position enum2D of </> enum2D of </> difference [ 1 1 ] RED GREEN [ 2 0 ] RED GREEN [ 2 1 ] RED GREEN +Attribute: <enum2D of </>> and <enum2D of </>> +6 differences found position vlen2D of </> vlen2D of </> difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 @@ -621,6 +713,8 @@ position vlen2D of </> vlen2D of </> difference [ 2 1 ] 9 0 9 [ 2 1 ] 10 0 10 [ 2 1 ] 11 0 11 +Attribute: <vlen2D of </>> and <vlen2D of </>> +11 differences found position array2D of </> array2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -641,6 +735,8 @@ position array2D of </> array2D of </> difference [ 2 1 ] 16 0 16 [ 2 1 ] 17 0 17 [ 2 1 ] 18 0 18 +Attribute: <array2D of </>> and <array2D of </>> +18 differences found position integer2D of </> integer2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -649,6 +745,8 @@ position integer2D of </> integer2D of </> difference [ 1 1 ] 4 0 4 [ 2 0 ] 5 0 5 [ 2 1 ] 6 0 6 +Attribute: <integer2D of </>> and <integer2D of </>> +6 differences found position float2D of </> float2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1.000000 0.000000 1.000000 @@ -657,6 +755,8 @@ position float2D of </> float2D of </> difference [ 1 1 ] 4.000000 0.000000 4.000000 [ 2 0 ] 5.000000 0.000000 5.000000 [ 2 1 ] 6.000000 0.000000 6.000000 +Attribute: <float2D of </>> and <float2D of </>> +6 differences found position string3D of </> string3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] a z @@ -706,6 +806,8 @@ position string3D of </> string3D of </> difference [ 3 2 0 ] W z [ 3 2 1 ] X z [ 3 2 1 ] Z z +Attribute: <string3D of </>> and <string3D of </>> +47 differences found position bitfield3D of </> bitfield3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -732,6 +834,8 @@ position bitfield3D of </> bitfield3D of </> difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 +Attribute: <bitfield3D of </>> and <bitfield3D of </>> +24 differences found position opaque3D of </> opaque3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -758,6 +862,8 @@ position opaque3D of </> opaque3D of </> difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 +Attribute: <opaque3D of </>> and <opaque3D of </>> +24 differences found position compound3D of </> compound3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -808,6 +914,8 @@ position compound3D of </> compound3D of </> difference [ 3 2 0 ] 46.000000 0.000000 46.000000 [ 3 2 1 ] 47 0 47 [ 3 2 1 ] 48.000000 0.000000 48.000000 +Attribute: <compound3D of </>> and <compound3D of </>> +48 differences found position enum3D of </> enum3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] GREEN RED @@ -834,6 +942,8 @@ position enum3D of </> enum3D of </> difference [ 3 1 1 ] GREEN RED [ 3 2 0 ] GREEN RED [ 3 2 1 ] GREEN RED +Attribute: <enum3D of </>> and <enum3D of </>> +24 differences found position vlen3D of </> vlen3D of </> difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 @@ -895,6 +1005,8 @@ position vlen3D of </> vlen3D of </> difference [ 3 2 1 ] 57 0 57 [ 3 2 1 ] 58 0 58 [ 3 2 1 ] 59 0 59 +Attribute: <vlen3D of </>> and <vlen3D of </>> +59 differences found position array3D of </> array3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -969,6 +1081,8 @@ position array3D of </> array3D of </> difference [ 3 2 1 ] 70 0 70 [ 3 2 1 ] 71 0 71 [ 3 2 1 ] 72 0 72 +Attribute: <array3D of </>> and <array3D of </>> +72 differences found position integer3D of </> integer3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -995,6 +1109,8 @@ position integer3D of </> integer3D of </> difference [ 3 1 1 ] 22 0 22 [ 3 2 0 ] 23 0 23 [ 3 2 1 ] 24 0 24 +Attribute: <integer3D of </>> and <integer3D of </>> +24 differences found position float3D of </> float3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1.000000 0.000000 1.000000 @@ -1021,3 +1137,6 @@ position float3D of </> float3D of </> difference [ 3 1 1 ] 22.000000 0.000000 22.000000 [ 3 2 0 ] 23.000000 0.000000 23.000000 [ 3 2 1 ] 24.000000 0.000000 24.000000 +Attribute: <float3D of </>> and <float3D of </>> +24 differences found +0 differences found |