diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-03-21 15:10:17 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-03-21 15:10:17 (GMT) |
| commit | eb89d7b53ab95623ab454186a602e1cafc7391f0 (patch) | |
| tree | ceafe458b3011e38853e765352d3c7e59bbecce1 /tools/testfiles/tnestedcomp.h5.xml | |
| parent | 3e468e6ff65d540a439e99ea568a6bff7add7cea (diff) | |
| download | hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.zip hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.gz hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.bz2 | |
[svn-r22105] Description:
Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously. The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.
Tested on:
Mac OSX/64 10.7.3 (amazon) w/debug
Diffstat (limited to 'tools/testfiles/tnestedcomp.h5.xml')
| -rw-r--r-- | tools/testfiles/tnestedcomp.h5.xml | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/tools/testfiles/tnestedcomp.h5.xml b/tools/testfiles/tnestedcomp.h5.xml index a2f928b..2cae353 100644 --- a/tools/testfiles/tnestedcomp.h5.xml +++ b/tools/testfiles/tnestedcomp.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tnestedcomp.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/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Dataset Name="ArrayOfStructures" OBJ-XID="xid_744" H5Path= "/ArrayOfStructures" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -71,11 +68,16 @@ Expected output for 'h5dump --xml tnestedcomp.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 0 1 "A" -100 100 1 1 0.5 "B" -100 100 2 4 0.333333 "C" -100 100 - 3 9 0.25 "D" -100 100 4 16 0.2 "E" -100 100 - 5 25 0.166667 "F" -100 100 6 36 0.142857 "G" -100 100 - 7 49 0.125 "H" -100 100 8 64 0.111111 "I" -100 100 - 9 81 0.1 "J" -100 100 + 0 0 1 "A" -100 100 + 1 1 0.5 "B" -100 100 + 2 4 0.333333 "C" -100 100 + 3 9 0.25 "D" -100 100 + 4 16 0.2 "E" -100 100 + 5 25 0.166667 "F" -100 100 + 6 36 0.142857 "G" -100 100 + 7 49 0.125 "H" -100 100 + 8 64 0.111111 "I" -100 100 + 9 81 0.1 "J" -100 100 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> |