diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-21 19:39:40 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-21 19:39:40 (GMT) |
commit | 0c8e622e1acfe4dbf0d8dd25a514a231c08d388d (patch) | |
tree | 19388a211f93c4fd6135cad4ad9d25f41def7ab6 /tools | |
parent | f383c2a622990b3164c45ac09dc9e8f2f64fe7dd (diff) | |
download | hdf5-0c8e622e1acfe4dbf0d8dd25a514a231c08d388d.zip hdf5-0c8e622e1acfe4dbf0d8dd25a514a231c08d388d.tar.gz hdf5-0c8e622e1acfe4dbf0d8dd25a514a231c08d388d.tar.bz2 |
[svn-r17210] Description:
Bring r17157:17209 from trunk to revise_chunks branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.7 (amazon) in debug mode
Mac OS X/32 10.5.7 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'tools')
-rw-r--r-- | tools/testfiles/tvlstr.h5 | bin | 8192 -> 8192 bytes | |||
-rw-r--r-- | tools/testfiles/tvlstr.h5.xml | 8 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/testfiles/tvlstr.h5 b/tools/testfiles/tvlstr.h5 Binary files differindex 769d811..acd8a1f 100644 --- a/tools/testfiles/tvlstr.h5 +++ b/tools/testfiles/tvlstr.h5 diff --git a/tools/testfiles/tvlstr.h5.xml b/tools/testfiles/tvlstr.h5.xml index 5999abd..507f0eb 100644 --- a/tools/testfiles/tvlstr.h5.xml +++ b/tools/testfiles/tvlstr.h5.xml @@ -3,19 +3,19 @@ Expected output for 'h5dump --xml tvlstr.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:RootGroup OBJ-XID="xid_928" H5Path="/"> +<hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> <hdf5:Attribute Name="test_scalar"> <hdf5:Dataspace> <hdf5:ScalarDataspace /> </hdf5:Dataspace> - <hdf5:NamedDataTypePtr OBJ-XID="xid_1576" H5Path="/vl_string_type" /> + <hdf5:NamedDataTypePtr OBJ-XID="xid_1400" H5Path="/vl_string_type" /> <hdf5:Data> <hdf5:DataFromFile> "This is the string for the attribute" </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> - <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> + <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_800" H5Path= "/Dataset1" Parents="xid_96" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> @@ -46,7 +46,7 @@ Expected output for 'h5dump --xml tvlstr.h5' </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> - <hdf5:NamedDataType Name="vl_string_type" OBJ-XID="xid_1576" H5Path="/vl_string_type" Parents="xid_928" H5ParentPaths="/"> + <hdf5:NamedDataType Name="vl_string_type" OBJ-XID="xid_1400" H5Path="/vl_string_type" Parents="xid_96" H5ParentPaths="/"> <hdf5:DataType> <hdf5:AtomicType> <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="H5T_VARIABLE" StrPad="H5T_STR_NULLPAD"/> |