[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
This commit is contained in:
Quincey Koziol
2012-03-21 10:10:17 -05:00
parent 3e468e6ff6
commit eb89d7b53a
1153 changed files with 132848 additions and 66574 deletions

View File

@@ -1,17 +1,14 @@
#############################
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">
<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://www.hdfgroup.org/HDF5/XML/schema/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">
<FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
<FillValue>
<NoFill/>
<NoFill/>
</FillValue>
</FillValueInfo>
<Dataspace>
@@ -26,7 +23,12 @@ Expected output for 'h5dump -u -m %.7f tfpformat.h5'
</DataType>
<Data>
<DataFromFile>
-0.1234567 0.1234567 0.0000000 0.0000000 0.0000000 0.0000000
-0.1234567
0.1234567
0.0000000
0.0000000
0.0000000
0.0000000
</DataFromFile>
</Data>
</Dataset>
@@ -34,9 +36,9 @@ Expected output for 'h5dump -u -m %.7f tfpformat.h5'
<StorageLayout>
<ContiguousLayout/>
</StorageLayout>
<FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
<FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
<FillValue>
<NoFill/>
<NoFill/>
</FillValue>
</FillValueInfo>
<Dataspace>
@@ -51,7 +53,12 @@ Expected output for 'h5dump -u -m %.7f tfpformat.h5'
</DataType>
<Data>
<DataFromFile>
-0.1234567 0.1234567 0.0000000 0.0000000 0.0000000 0.0000000
-0.1234567
0.1234567
0.0000000
0.0000000
0.0000000
0.0000000
</DataFromFile>
</Data>
</Dataset>