diff options
author | Neil Fortner <nfortne2@hdfgroup.org> | 2008-10-16 03:52:16 (GMT) |
---|---|---|
committer | Neil Fortner <nfortne2@hdfgroup.org> | 2008-10-16 03:52:16 (GMT) |
commit | ad28fa5b0c1384fe70397fb2eaa83e2a6e62699d (patch) | |
tree | a71c5b86d440ffdb059864d75e35e3c41102a01b /tools/testfiles/tnamed_dtype_attr.h5.xml | |
parent | 273f31211ed4725fde9e7b5b35a884d3f2359246 (diff) | |
download | hdf5-ad28fa5b0c1384fe70397fb2eaa83e2a6e62699d.zip hdf5-ad28fa5b0c1384fe70397fb2eaa83e2a6e62699d.tar.gz hdf5-ad28fa5b0c1384fe70397fb2eaa83e2a6e62699d.tar.bz2 |
[svn-r15886] Purpose: Close bug 1332
Description: Improved external link traversal of h5dump. h5dump will now
properly avoid all cycles, even those spanning multiple files. Improvement
to the output of committed datatypes. Committed datatypes are now checked
for uniqueness (like other objects). Tests added for these cases.
Tested: kagiso, linew, smirom (h5committest)
Diffstat (limited to 'tools/testfiles/tnamed_dtype_attr.h5.xml')
-rw-r--r-- | tools/testfiles/tnamed_dtype_attr.h5.xml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tools/testfiles/tnamed_dtype_attr.h5.xml b/tools/testfiles/tnamed_dtype_attr.h5.xml index 0b9ceae..2e3cfa3 100644 --- a/tools/testfiles/tnamed_dtype_attr.h5.xml +++ b/tools/testfiles/tnamed_dtype_attr.h5.xml @@ -4,7 +4,7 @@ Expected output for 'h5dump --xml tnamed_dtype_attr.h5' <?xml version="1.0" encoding="UTF-8"?> <hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5File http://hdfgroup.org/DTDs/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> - <hdf5:Dataset Name="Dataset" OBJ-XID="xid_1264" H5Path= "/Dataset" Parents="xid_96" H5ParentPaths="/"> + <hdf5:Dataset Name="Dataset" OBJ-XID="xid_1256" H5Path= "/Dataset" Parents="xid_96" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -16,12 +16,12 @@ Expected output for 'h5dump --xml tnamed_dtype_attr.h5' <hdf5:Dataspace> <hdf5:ScalarDataspace /> </hdf5:Dataspace> - <hdf5:NamedDataTypePtr OBJ-XID="xid_792" H5Path="/Datatype" /> + <hdf5:NamedDataTypePtr OBJ-XID="xid_800" H5Path="/Datatype" /> <hdf5:Attribute Name="Attribute"> <hdf5:Dataspace> <hdf5:ScalarDataspace /> </hdf5:Dataspace> - <hdf5:NamedDataTypePtr OBJ-XID="xid_792" H5Path="/Datatype" /> + <hdf5:NamedDataTypePtr OBJ-XID="xid_800" H5Path="/Datatype" /> <hdf5:Data> <hdf5:DataFromFile> 8 @@ -32,19 +32,22 @@ Expected output for 'h5dump --xml tnamed_dtype_attr.h5' <hdf5:NoData/> </hdf5:Data> </hdf5:Dataset> - <hdf5:NamedDataType Name="Datatype" OBJ-XID="xid_792" H5Path="/Datatype" Parents="xid_96" H5ParentPaths="/"> + <hdf5:NamedDataType Name="Datatype" OBJ-XID="xid_800" 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:Group Name="g1" OBJ-XID="xid_1536" H5Path="/g1" Parents="xid_96" H5ParentPaths="/" > + <hdf5:NamedDataType Name="Link_to_Datatype" OBJ-XID="xid_800" H5Path="/Link_to_Datatype" Parents="xid_96" H5ParentPaths="/"> + <hdf5:NamedDatatypePtr OBJ-XID="xid_800" H5Path="/Datatype"/> + </hdf5:NamedDataType> + <hdf5:Group Name="g1" OBJ-XID="xid_1528" H5Path="/g1" Parents="xid_96" H5ParentPaths="/" > <hdf5:Attribute Name="Attribute"> <hdf5:Dataspace> <hdf5:ScalarDataspace /> </hdf5:Dataspace> - <hdf5:NamedDataTypePtr OBJ-XID="xid_792" H5Path="/Datatype" /> + <hdf5:NamedDataTypePtr OBJ-XID="xid_800" H5Path="/Datatype" /> <hdf5:Data> <hdf5:DataFromFile> 8 |