philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r19179] Description:

Browse Source 
Bring changes from Coverity branch back to trunk:

r19079 & 19080:
[BZ1942]  h5dump -u to generate XML, it does not respect the -m option

xml version of dump_data function didn't check for use of fp_format variable.

Added new test expected file for committed bug 1942

r19103, 19104 & 19105:
[BZ1821] h5repack -v did not display correct output for a selected compression. Needed new test for comparing output of -v option.

Added new test file for solution to BZ1821

BZ1821 - Bring test changes from the shell script actually used.

Tested on:
    Mac OS X/32 10.6.4 (amazon) debug & production
    (h5committested on branch)
This commit is contained in:
Quincey Koziol
2010-08-05 18:19:01 -05:00
parent 1fe94ec545
commit 0de252524d
9 changed files with 173 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
tools/testfiles/tfpformat.h5.xml Normal file
View File

@@ -0,0 +1,59 @@
#############################
Expected output for 'h5dump -u -m %.7f tfpformat.h5'
#############################
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://www.hdfgroup.org/DTDs/HDF5-File.dtd">
<HDF5-File>
<RootGroup OBJ-XID="xid_96" H5Path="/">
<Dataset Name="double" OBJ-XID="xid_800" H5Path= "/double" Parents="xid_96" H5ParentPaths="/">
<StorageLayout>
<ContiguousLayout/>
</StorageLayout>
<FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
<FillValue>
<NoFill/>
</FillValue>
</FillValueInfo>
<Dataspace>
<SimpleDataspace Ndims="1">
<Dimension DimSize="6" MaxDimSize="6"/>
</SimpleDataspace>
</Dataspace>
<DataType>
<AtomicType>
<FloatType ByteOrder="LE" Size="8" SignBitLocation="63" ExponentBits="11" ExponentLocation="52" MantissaBits="52" MantissaLocation="0" />
</AtomicType>
</DataType>
<Data>
<DataFromFile>
-0.1234567 0.1234567 0.0000000 0.0000000 0.0000000 0.0000000
</DataFromFile>
</Data>
</Dataset>
<Dataset Name="float" OBJ-XID="xid_1400" H5Path= "/float" Parents="xid_96" H5ParentPaths="/">
<StorageLayout>
<ContiguousLayout/>
</StorageLayout>
<FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
<FillValue>
<NoFill/>
</FillValue>
</FillValueInfo>
<Dataspace>
<SimpleDataspace Ndims="1">
<Dimension DimSize="6" MaxDimSize="6"/>
</SimpleDataspace>
</Dataspace>
<DataType>
<AtomicType>
<FloatType ByteOrder="LE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
</AtomicType>
</DataType>
<Data>
<DataFromFile>
-0.1234567 0.1234567 0.0000000 0.0000000 0.0000000 0.0000000
</DataFromFile>
</Data>
</Dataset>
</RootGroup>
</HDF5-File>