diff options
author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-03-27 18:22:55 (GMT) |
---|---|---|
committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-03-27 18:22:55 (GMT) |
commit | 983e043587f221bc2d0ebc17e403f8f61f438dfd (patch) | |
tree | b23ab77a81b4b59c6da05c58c17eb137e8b56897 /tools/testfiles | |
parent | 4c0b3c3d5af667dc3bc165463bcc8a1ce382a599 (diff) | |
download | hdf5-983e043587f221bc2d0ebc17e403f8f61f438dfd.zip hdf5-983e043587f221bc2d0ebc17e403f8f61f438dfd.tar.gz hdf5-983e043587f221bc2d0ebc17e403f8f61f438dfd.tar.bz2 |
[svn-r12158] Purpose:
bug fix
Description:
h5dump was not printing attributes for the named datatype cases
Solution:
Platforms tested:
linux
solaris
AIX
Misc. update:
Diffstat (limited to 'tools/testfiles')
-rw-r--r-- | tools/testfiles/tnamed_dtype_attr.ddl | 21 | ||||
-rw-r--r-- | tools/testfiles/tnamed_dtype_attr.h5 | bin | 1656 -> 944 bytes | |||
-rw-r--r-- | tools/testfiles/tnamed_dtype_attr.h5.xml | 23 |
3 files changed, 38 insertions, 6 deletions
diff --git a/tools/testfiles/tnamed_dtype_attr.ddl b/tools/testfiles/tnamed_dtype_attr.ddl index 5512d38..391abf8 100644 --- a/tools/testfiles/tnamed_dtype_attr.ddl +++ b/tools/testfiles/tnamed_dtype_attr.ddl @@ -1,11 +1,14 @@ ############################# -Expected output for 'h5dump -A tnamed_dtype_attr.h5' +Expected output for 'h5dump tnamed_dtype_attr.h5' ############################# HDF5 "tnamed_dtype_attr.h5" { GROUP "/" { DATASET "Dataset" { DATATYPE "/Datatype" DATASPACE SCALAR + DATA { + (0): 0 + } ATTRIBUTE "Attribute" { DATATYPE "/Datatype" DATASPACE SCALAR @@ -15,6 +18,22 @@ GROUP "/" { } } DATATYPE "Datatype" H5T_STD_I32LE; + ATTRIBUTE "Attribute" { + DATATYPE H5T_STD_I32LE + DATASPACE SCALAR + DATA { + (0): 8 + } + } + GROUP "g1" { + ATTRIBUTE "Attribute" { + DATATYPE "/Datatype" + DATASPACE SCALAR + DATA { + (0): 8 + } + } + } } } diff --git a/tools/testfiles/tnamed_dtype_attr.h5 b/tools/testfiles/tnamed_dtype_attr.h5 Binary files differindex cb40ddc..12f5d95 100644 --- a/tools/testfiles/tnamed_dtype_attr.h5 +++ b/tools/testfiles/tnamed_dtype_attr.h5 diff --git a/tools/testfiles/tnamed_dtype_attr.h5.xml b/tools/testfiles/tnamed_dtype_attr.h5.xml index 2986c41..984295c 100644 --- a/tools/testfiles/tnamed_dtype_attr.h5.xml +++ b/tools/testfiles/tnamed_dtype_attr.h5.xml @@ -3,15 +3,15 @@ Expected output for 'h5dump --xml tnamed_dtype_attr.h5' ############################# <?xml version="1.0" encoding="UTF-8"?> <hdf5:HDF5-File xmlns:hdf5="http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdf.ncsa.uiuc.edu/DTDs/HDF5File http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.xsd"> -<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> - <hdf5:NamedDataType Name="Datatype" OBJ-XID="xid_976" H5Path="/Datatype" Parents="xid_928" H5ParentPaths="/"> +<hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> + <hdf5:NamedDataType Name="Datatype" OBJ-XID="xid_328" H5Path="/Datatype" Parents="xid_96" H5ParentPaths="/"> <hdf5:DataType> <hdf5:AtomicType> <hdf5:IntegerType ByteOrder="LE" Sign="true" Size="4" /> </hdf5:AtomicType> </hdf5:DataType> </hdf5:NamedDataType> - <hdf5:Dataset Name="Dataset" OBJ-XID="xid_1384" H5Path= "/Dataset" Parents="xid_928" H5ParentPaths="/"> + <hdf5:Dataset Name="Dataset" OBJ-XID="xid_440" H5Path= "/Dataset" Parents="xid_96" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -23,12 +23,12 @@ Expected output for 'h5dump --xml tnamed_dtype_attr.h5' <hdf5:Dataspace> <hdf5:ScalarDataspace /> </hdf5:Dataspace> - <hdf5:NamedDataTypePtr OBJ-XID="xid_976" H5Path="/Datatype" /> + <hdf5:NamedDataTypePtr OBJ-XID="xid_328" H5Path="/Datatype" /> <hdf5:Attribute Name="Attribute"> <hdf5:Dataspace> <hdf5:ScalarDataspace /> </hdf5:Dataspace> - <hdf5:NamedDataTypePtr OBJ-XID="xid_976" H5Path="/Datatype" /> + <hdf5:NamedDataTypePtr OBJ-XID="xid_328" H5Path="/Datatype" /> <hdf5:Data> <hdf5:DataFromFile> 8 @@ -39,5 +39,18 @@ Expected output for 'h5dump --xml tnamed_dtype_attr.h5' <hdf5:NoData/> </hdf5:Data> </hdf5:Dataset> + <hdf5:Group Name="g1" OBJ-XID="xid_712" H5Path="/g1" Parents="xid_96" H5ParentPaths="/" > + <hdf5:Attribute Name="Attribute"> + <hdf5:Dataspace> + <hdf5:ScalarDataspace /> + </hdf5:Dataspace> + <hdf5:NamedDataTypePtr OBJ-XID="xid_328" H5Path="/Datatype" /> + <hdf5:Data> + <hdf5:DataFromFile> + 8 + </hdf5:DataFromFile> + </hdf5:Data> + </hdf5:Attribute> + </hdf5:Group> </hdf5:RootGroup> </hdf5:HDF5-File> |