diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-05 23:19:01 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-05 23:19:01 (GMT) |
| commit | 0de252524dfec1028bdd9241dbd4cca46535b93a (patch) | |
| tree | cb9df4f6d8db74ee263e82459e562037c26de611 /tools/testfiles | |
| parent | 1fe94ec545b2ae92fefc16eb3d9864e52b12107d (diff) | |
| download | hdf5-0de252524dfec1028bdd9241dbd4cca46535b93a.zip hdf5-0de252524dfec1028bdd9241dbd4cca46535b93a.tar.gz hdf5-0de252524dfec1028bdd9241dbd4cca46535b93a.tar.bz2 | |
[svn-r19179] Description:
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)
Diffstat (limited to 'tools/testfiles')
| -rw-r--r-- | tools/testfiles/h5repack_filters.h5.ddl | 13 | ||||
| -rw-r--r-- | tools/testfiles/tfpformat.h5.xml | 59 |
2 files changed, 72 insertions, 0 deletions
diff --git a/tools/testfiles/h5repack_filters.h5.ddl b/tools/testfiles/h5repack_filters.h5.ddl new file mode 100644 index 0000000..36e65b9 --- /dev/null +++ b/tools/testfiles/h5repack_filters.h5.ddl @@ -0,0 +1,13 @@ +Objects to modify layout are... +Objects to apply filter are... + </dset_deflate> with GZIP filter + </dset_deflate>...Found +----------------------------------------- + Type Filter (Compression) Name +----------------------------------------- + group / + dset /dset_all + dset GZIP (0.995:1) /dset_deflate + dset /dset_fletcher32 + dset /dset_nbit + dset /dset_shuffle diff --git a/tools/testfiles/tfpformat.h5.xml b/tools/testfiles/tfpformat.h5.xml new file mode 100644 index 0000000..939d7b3 --- /dev/null +++ b/tools/testfiles/tfpformat.h5.xml @@ -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> |