diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2006-10-09 04:18:18 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-10-09 04:18:18 (GMT) |
commit | 14dcb6db33f88011c3499d439c53890ab09d1ba2 (patch) | |
tree | cc05060f7dd94342c2e06726ef6b550bf4a7d8f1 /tools/testfiles | |
parent | 20720af231c875330a6074f65ee1c54e6a806fbb (diff) | |
download | hdf5-14dcb6db33f88011c3499d439c53890ab09d1ba2.zip hdf5-14dcb6db33f88011c3499d439c53890ab09d1ba2.tar.gz hdf5-14dcb6db33f88011c3499d439c53890ab09d1ba2.tar.bz2 |
[svn-r12736] Description:
Add "use the latest format" support for dataspace object header encode/
decode routines and clean up format a bit for the latest format (new to 1.8.x
releases)
Remove storing 'perm' parameter for array datatypes in memory and the file,
and add test to make certain that if any user applications are attempting to
store them, we get some reports back. (Should be unlikely, since the RefMan
says that the parameter is not implemented and is unsupported).
Carry those changes into the tests, etc.
Clean up a bunch more compiler warnings.
Tested on:
FreeBSD/32 4.11 (sleipnir) w/threadsafe
Linux/32 2.4 (heping) w/FORTRAN & C++
Linux/64 2.4 (mir) w/enable-1.6-compat
Diffstat (limited to 'tools/testfiles')
-rw-r--r-- | tools/testfiles/tarray1.h5.xml | 2 | ||||
-rw-r--r-- | tools/testfiles/tarray2.h5.xml | 6 | ||||
-rw-r--r-- | tools/testfiles/tarray3.h5.xml | 6 | ||||
-rw-r--r-- | tools/testfiles/tarray6.h5.xml | 2 | ||||
-rw-r--r-- | tools/testfiles/tarray7.h5.xml | 4 | ||||
-rw-r--r-- | tools/testfiles/tcompound.h5.xml | 6 | ||||
-rw-r--r-- | tools/testfiles/tcompound2.h5.xml | 6 | ||||
-rw-r--r-- | tools/testfiles/tcompound_complex.h5.xml | 8 | ||||
-rw-r--r-- | tools/testfiles/tempty-dtd-2.h5.xml | 2 | ||||
-rw-r--r-- | tools/testfiles/tempty-dtd-uri.h5.xml | 2 | ||||
-rw-r--r-- | tools/testfiles/tempty-dtd.h5.xml | 2 | ||||
-rw-r--r-- | tools/testfiles/tempty-nons-2.h5.xml | 2 | ||||
-rw-r--r-- | tools/testfiles/tempty-nons-uri.h5.xml | 2 | ||||
-rw-r--r-- | tools/testfiles/tempty-nons.h5.xml | 2 | ||||
-rw-r--r-- | tools/testfiles/tempty-ns-2.h5.xml | 2 | ||||
-rw-r--r-- | tools/testfiles/tempty-ns.h5.xml | 2 | ||||
-rw-r--r-- | tools/testfiles/tempty.h5.xml | 2 | ||||
-rw-r--r-- | tools/testfiles/tmany.h5.xml | 24 | ||||
-rw-r--r-- | tools/testfiles/tnestedcomp.h5.xml | 2 | ||||
-rw-r--r-- | tools/testfiles/tsaf.h5.xml | 8 | ||||
-rw-r--r-- | tools/testfiles/tstr.h5.xml | 8 |
21 files changed, 50 insertions, 50 deletions
diff --git a/tools/testfiles/tarray1.h5.xml b/tools/testfiles/tarray1.h5.xml index 95e922e..b4d17ca 100644 --- a/tools/testfiles/tarray1.h5.xml +++ b/tools/testfiles/tarray1.h5.xml @@ -20,7 +20,7 @@ Expected output for 'h5dump --xml tarray1.h5' </hdf5:Dataspace> <hdf5:DataType> <hdf5:ArrayType Ndims="1"> - <hdf5:ArrayDimension DimSize="4" DimPerm="0"/> + <hdf5:ArrayDimension DimSize="4"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:IntegerType ByteOrder="LE" Sign="true" Size="4" /> diff --git a/tools/testfiles/tarray2.h5.xml b/tools/testfiles/tarray2.h5.xml index 15bb8c6..ac5fe50 100644 --- a/tools/testfiles/tarray2.h5.xml +++ b/tools/testfiles/tarray2.h5.xml @@ -20,9 +20,9 @@ Expected output for 'h5dump --xml tarray2.h5' </hdf5:Dataspace> <hdf5:DataType> <hdf5:ArrayType Ndims="3"> - <hdf5:ArrayDimension DimSize="3" DimPerm="0"/> - <hdf5:ArrayDimension DimSize="4" DimPerm="1"/> - <hdf5:ArrayDimension DimSize="5" DimPerm="2"/> + <hdf5:ArrayDimension DimSize="3"/> + <hdf5:ArrayDimension DimSize="4"/> + <hdf5:ArrayDimension DimSize="5"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:IntegerType ByteOrder="LE" Sign="true" Size="4" /> diff --git a/tools/testfiles/tarray3.h5.xml b/tools/testfiles/tarray3.h5.xml index 42ec1ad..d496a46 100644 --- a/tools/testfiles/tarray3.h5.xml +++ b/tools/testfiles/tarray3.h5.xml @@ -20,11 +20,11 @@ Expected output for 'h5dump --xml tarray3.h5' </hdf5:Dataspace> <hdf5:DataType> <hdf5:ArrayType Ndims="1"> - <hdf5:ArrayDimension DimSize="4" DimPerm="0"/> + <hdf5:ArrayDimension DimSize="4"/> <hdf5:DataType> <hdf5:ArrayType Ndims="2"> - <hdf5:ArrayDimension DimSize="6" DimPerm="0"/> - <hdf5:ArrayDimension DimSize="3" DimPerm="1"/> + <hdf5:ArrayDimension DimSize="6"/> + <hdf5:ArrayDimension DimSize="3"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:IntegerType ByteOrder="LE" Sign="true" Size="4" /> diff --git a/tools/testfiles/tarray6.h5.xml b/tools/testfiles/tarray6.h5.xml index ffbd849..cb9b853 100644 --- a/tools/testfiles/tarray6.h5.xml +++ b/tools/testfiles/tarray6.h5.xml @@ -20,7 +20,7 @@ Expected output for 'h5dump --xml tarray6.h5' </hdf5:Dataspace> <hdf5:DataType> <hdf5:ArrayType Ndims="1"> - <hdf5:ArrayDimension DimSize="4" DimPerm="0"/> + <hdf5:ArrayDimension DimSize="4"/> <hdf5:DataType> <hdf5:VLType> <hdf5:DataType> diff --git a/tools/testfiles/tarray7.h5.xml b/tools/testfiles/tarray7.h5.xml index 8b0123f..f9c6611 100644 --- a/tools/testfiles/tarray7.h5.xml +++ b/tools/testfiles/tarray7.h5.xml @@ -20,12 +20,12 @@ Expected output for 'h5dump --xml tarray7.h5' </hdf5:Dataspace> <hdf5:DataType> <hdf5:ArrayType Ndims="1"> - <hdf5:ArrayDimension DimSize="4" DimPerm="0"/> + <hdf5:ArrayDimension DimSize="4"/> <hdf5:DataType> <hdf5:VLType> <hdf5:DataType> <hdf5:ArrayType Ndims="1"> - <hdf5:ArrayDimension DimSize="4" DimPerm="0"/> + <hdf5:ArrayDimension DimSize="4"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:IntegerType ByteOrder="LE" Sign="false" Size="4" /> diff --git a/tools/testfiles/tcompound.h5.xml b/tools/testfiles/tcompound.h5.xml index e2e43e2..698b3a4 100644 --- a/tools/testfiles/tcompound.h5.xml +++ b/tools/testfiles/tcompound.h5.xml @@ -50,7 +50,7 @@ Expected output for 'h5dump --xml tcompound.h5' <hdf5:Field FieldName="int_array"> <hdf5:DataType> <hdf5:ArrayType Ndims="1"> - <hdf5:ArrayDimension DimSize="4" DimPerm="0"/> + <hdf5:ArrayDimension DimSize="4"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" /> @@ -62,8 +62,8 @@ Expected output for 'h5dump --xml tcompound.h5' <hdf5:Field FieldName="float_array"> <hdf5:DataType> <hdf5:ArrayType Ndims="2"> - <hdf5:ArrayDimension DimSize="5" DimPerm="0"/> - <hdf5:ArrayDimension DimSize="6" DimPerm="1"/> + <hdf5:ArrayDimension DimSize="5"/> + <hdf5:ArrayDimension DimSize="6"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" /> diff --git a/tools/testfiles/tcompound2.h5.xml b/tools/testfiles/tcompound2.h5.xml index b6d5800..0abfc55 100644 --- a/tools/testfiles/tcompound2.h5.xml +++ b/tools/testfiles/tcompound2.h5.xml @@ -50,7 +50,7 @@ Expected output for 'h5dump --xml tcompound2.h5' <hdf5:Field FieldName="int_array"> <hdf5:DataType> <hdf5:ArrayType Ndims="1"> - <hdf5:ArrayDimension DimSize="4" DimPerm="0"/> + <hdf5:ArrayDimension DimSize="4"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" /> @@ -62,8 +62,8 @@ Expected output for 'h5dump --xml tcompound2.h5' <hdf5:Field FieldName="float_array"> <hdf5:DataType> <hdf5:ArrayType Ndims="2"> - <hdf5:ArrayDimension DimSize="5" DimPerm="0"/> - <hdf5:ArrayDimension DimSize="6" DimPerm="1"/> + <hdf5:ArrayDimension DimSize="5"/> + <hdf5:ArrayDimension DimSize="6"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" /> diff --git a/tools/testfiles/tcompound_complex.h5.xml b/tools/testfiles/tcompound_complex.h5.xml index e745046..8300deb 100644 --- a/tools/testfiles/tcompound_complex.h5.xml +++ b/tools/testfiles/tcompound_complex.h5.xml @@ -33,7 +33,7 @@ Expected output for 'h5dump --xml tcompound_complex.h5' <hdf5:Field FieldName="b_name"> <hdf5:DataType> <hdf5:ArrayType Ndims="1"> - <hdf5:ArrayDimension DimSize="4" DimPerm="0"/> + <hdf5:ArrayDimension DimSize="4"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="H5T_VARIABLE" StrPad="H5T_STR_NULLTERM"/> @@ -52,8 +52,8 @@ Expected output for 'h5dump --xml tcompound_complex.h5' <hdf5:Field FieldName="d_name"> <hdf5:DataType> <hdf5:ArrayType Ndims="2"> - <hdf5:ArrayDimension DimSize="5" DimPerm="0"/> - <hdf5:ArrayDimension DimSize="6" DimPerm="1"/> + <hdf5:ArrayDimension DimSize="5"/> + <hdf5:ArrayDimension DimSize="6"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="2" /> @@ -72,7 +72,7 @@ Expected output for 'h5dump --xml tcompound_complex.h5' <hdf5:Field FieldName="f_name"> <hdf5:DataType> <hdf5:ArrayType Ndims="1"> - <hdf5:ArrayDimension DimSize="10" DimPerm="0"/> + <hdf5:ArrayDimension DimSize="10"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:FloatType ByteOrder="BE" Size="8" SignBitLocation="63" ExponentBits="11" ExponentLocation="52" MantissaBits="52" MantissaLocation="0" /> diff --git a/tools/testfiles/tempty-dtd-2.h5.xml b/tools/testfiles/tempty-dtd-2.h5.xml index a5a9128..0b89823 100644 --- a/tools/testfiles/tempty-dtd-2.h5.xml +++ b/tools/testfiles/tempty-dtd-2.h5.xml @@ -101,7 +101,7 @@ Expected output for 'h5dump --xml -u tempty.h5' </Dataspace> <DataType> <ArrayType Ndims="1"> - <ArrayDimension DimSize="4" DimPerm="0"/> + <ArrayDimension DimSize="4"/> <DataType> <AtomicType> <IntegerType ByteOrder="LE" Sign="true" Size="4" /> diff --git a/tools/testfiles/tempty-dtd-uri.h5.xml b/tools/testfiles/tempty-dtd-uri.h5.xml index 6b2c4bc..29c63bd 100644 --- a/tools/testfiles/tempty-dtd-uri.h5.xml +++ b/tools/testfiles/tempty-dtd-uri.h5.xml @@ -101,7 +101,7 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt </Dataspace> <DataType> <ArrayType Ndims="1"> - <ArrayDimension DimSize="4" DimPerm="0"/> + <ArrayDimension DimSize="4"/> <DataType> <AtomicType> <IntegerType ByteOrder="LE" Sign="true" Size="4" /> diff --git a/tools/testfiles/tempty-dtd.h5.xml b/tools/testfiles/tempty-dtd.h5.xml index 7d20d8d..aa1fa36 100644 --- a/tools/testfiles/tempty-dtd.h5.xml +++ b/tools/testfiles/tempty-dtd.h5.xml @@ -101,7 +101,7 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5' </Dataspace> <DataType> <ArrayType Ndims="1"> - <ArrayDimension DimSize="4" DimPerm="0"/> + <ArrayDimension DimSize="4"/> <DataType> <AtomicType> <IntegerType ByteOrder="LE" Sign="true" Size="4" /> diff --git a/tools/testfiles/tempty-nons-2.h5.xml b/tools/testfiles/tempty-nons-2.h5.xml index 31c35fb..528c4d3 100644 --- a/tools/testfiles/tempty-nons-2.h5.xml +++ b/tools/testfiles/tempty-nons-2.h5.xml @@ -100,7 +100,7 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5' </Dataspace> <DataType> <ArrayType Ndims="1"> - <ArrayDimension DimSize="4" DimPerm="0"/> + <ArrayDimension DimSize="4"/> <DataType> <AtomicType> <IntegerType ByteOrder="LE" Sign="true" Size="4" /> diff --git a/tools/testfiles/tempty-nons-uri.h5.xml b/tools/testfiles/tempty-nons-uri.h5.xml index 8484406..05471e1 100644 --- a/tools/testfiles/tempty-nons-uri.h5.xml +++ b/tools/testfiles/tempty-nons-uri.h5.xml @@ -100,7 +100,7 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp </Dataspace> <DataType> <ArrayType Ndims="1"> - <ArrayDimension DimSize="4" DimPerm="0"/> + <ArrayDimension DimSize="4"/> <DataType> <AtomicType> <IntegerType ByteOrder="LE" Sign="true" Size="4" /> diff --git a/tools/testfiles/tempty-nons.h5.xml b/tools/testfiles/tempty-nons.h5.xml index e4efee8..64fe60a 100644 --- a/tools/testfiles/tempty-nons.h5.xml +++ b/tools/testfiles/tempty-nons.h5.xml @@ -100,7 +100,7 @@ Expected output for 'h5dump --xml -X : tempty.h5' </Dataspace> <DataType> <ArrayType Ndims="1"> - <ArrayDimension DimSize="4" DimPerm="0"/> + <ArrayDimension DimSize="4"/> <DataType> <AtomicType> <IntegerType ByteOrder="LE" Sign="true" Size="4" /> diff --git a/tools/testfiles/tempty-ns-2.h5.xml b/tools/testfiles/tempty-ns-2.h5.xml index 1523fbc..0c7d153 100644 --- a/tools/testfiles/tempty-ns-2.h5.xml +++ b/tools/testfiles/tempty-ns-2.h5.xml @@ -100,7 +100,7 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5' </thing:Dataspace> <thing:DataType> <thing:ArrayType Ndims="1"> - <thing:ArrayDimension DimSize="4" DimPerm="0"/> + <thing:ArrayDimension DimSize="4"/> <thing:DataType> <thing:AtomicType> <thing:IntegerType ByteOrder="LE" Sign="true" Size="4" /> diff --git a/tools/testfiles/tempty-ns.h5.xml b/tools/testfiles/tempty-ns.h5.xml index ec8ca91..200c60a 100644 --- a/tools/testfiles/tempty-ns.h5.xml +++ b/tools/testfiles/tempty-ns.h5.xml @@ -100,7 +100,7 @@ Expected output for 'h5dump --xml -X thing: tempty.h5' </thing:Dataspace> <thing:DataType> <thing:ArrayType Ndims="1"> - <thing:ArrayDimension DimSize="4" DimPerm="0"/> + <thing:ArrayDimension DimSize="4"/> <thing:DataType> <thing:AtomicType> <thing:IntegerType ByteOrder="LE" Sign="true" Size="4" /> diff --git a/tools/testfiles/tempty.h5.xml b/tools/testfiles/tempty.h5.xml index 1c7f589..703c395 100644 --- a/tools/testfiles/tempty.h5.xml +++ b/tools/testfiles/tempty.h5.xml @@ -100,7 +100,7 @@ Expected output for 'h5dump --xml tempty.h5' </hdf5:Dataspace> <hdf5:DataType> <hdf5:ArrayType Ndims="1"> - <hdf5:ArrayDimension DimSize="4" DimPerm="0"/> + <hdf5:ArrayDimension DimSize="4"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:IntegerType ByteOrder="LE" Sign="true" Size="4" /> diff --git a/tools/testfiles/tmany.h5.xml b/tools/testfiles/tmany.h5.xml index 3bf1021..87f2c15 100644 --- a/tools/testfiles/tmany.h5.xml +++ b/tools/testfiles/tmany.h5.xml @@ -29,10 +29,10 @@ Expected output for 'h5dump --xml tmany.h5' <hdf5:Field FieldName="a_array"> <hdf5:DataType> <hdf5:ArrayType Ndims="4"> - <hdf5:ArrayDimension DimSize="2" DimPerm="0"/> - <hdf5:ArrayDimension DimSize="2" DimPerm="1"/> - <hdf5:ArrayDimension DimSize="2" DimPerm="2"/> - <hdf5:ArrayDimension DimSize="2" DimPerm="3"/> + <hdf5:ArrayDimension DimSize="2"/> + <hdf5:ArrayDimension DimSize="2"/> + <hdf5:ArrayDimension DimSize="2"/> + <hdf5:ArrayDimension DimSize="2"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" /> @@ -44,10 +44,10 @@ Expected output for 'h5dump --xml tmany.h5' <hdf5:Field FieldName="b_array"> <hdf5:DataType> <hdf5:ArrayType Ndims="4"> - <hdf5:ArrayDimension DimSize="2" DimPerm="0"/> - <hdf5:ArrayDimension DimSize="2" DimPerm="1"/> - <hdf5:ArrayDimension DimSize="2" DimPerm="2"/> - <hdf5:ArrayDimension DimSize="2" DimPerm="3"/> + <hdf5:ArrayDimension DimSize="2"/> + <hdf5:ArrayDimension DimSize="2"/> + <hdf5:ArrayDimension DimSize="2"/> + <hdf5:ArrayDimension DimSize="2"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:FloatType ByteOrder="BE" Size="8" SignBitLocation="63" ExponentBits="11" ExponentLocation="52" MantissaBits="52" MantissaLocation="0" /> @@ -59,10 +59,10 @@ Expected output for 'h5dump --xml tmany.h5' <hdf5:Field FieldName="c_array"> <hdf5:DataType> <hdf5:ArrayType Ndims="4"> - <hdf5:ArrayDimension DimSize="2" DimPerm="0"/> - <hdf5:ArrayDimension DimSize="2" DimPerm="1"/> - <hdf5:ArrayDimension DimSize="2" DimPerm="2"/> - <hdf5:ArrayDimension DimSize="2" DimPerm="3"/> + <hdf5:ArrayDimension DimSize="2"/> + <hdf5:ArrayDimension DimSize="2"/> + <hdf5:ArrayDimension DimSize="2"/> + <hdf5:ArrayDimension DimSize="2"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:FloatType ByteOrder="BE" Size="8" SignBitLocation="63" ExponentBits="11" ExponentLocation="52" MantissaBits="52" MantissaLocation="0" /> diff --git a/tools/testfiles/tnestedcomp.h5.xml b/tools/testfiles/tnestedcomp.h5.xml index 96a5092..1670180 100644 --- a/tools/testfiles/tnestedcomp.h5.xml +++ b/tools/testfiles/tnestedcomp.h5.xml @@ -54,7 +54,7 @@ Expected output for 'h5dump --xml tnestedcomp.h5' <hdf5:Field FieldName="array_name"> <hdf5:DataType> <hdf5:ArrayType Ndims="1"> - <hdf5:ArrayDimension DimSize="2" DimPerm="0"/> + <hdf5:ArrayDimension DimSize="2"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:FloatType ByteOrder="LE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" /> diff --git a/tools/testfiles/tsaf.h5.xml b/tools/testfiles/tsaf.h5.xml index 4959366..bd73334 100644 --- a/tools/testfiles/tsaf.h5.xml +++ b/tools/testfiles/tsaf.h5.xml @@ -1329,7 +1329,7 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:Field FieldName="_"> <hdf5:DataType> <hdf5:ArrayType Ndims="1"> - <hdf5:ArrayDimension DimSize="8" DimPerm="0"/> + <hdf5:ArrayDimension DimSize="8"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" /> @@ -1347,7 +1347,7 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:Field FieldName="_"> <hdf5:DataType> <hdf5:ArrayType Ndims="1"> - <hdf5:ArrayDimension DimSize="8" DimPerm="0"/> + <hdf5:ArrayDimension DimSize="8"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" /> @@ -1365,7 +1365,7 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:Field FieldName="_"> <hdf5:DataType> <hdf5:ArrayType Ndims="1"> - <hdf5:ArrayDimension DimSize="8" DimPerm="0"/> + <hdf5:ArrayDimension DimSize="8"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" /> @@ -1882,7 +1882,7 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:Field FieldName="_"> <hdf5:DataType> <hdf5:ArrayType Ndims="1"> - <hdf5:ArrayDimension DimSize="16" DimPerm="0"/> + <hdf5:ArrayDimension DimSize="16"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" /> diff --git a/tools/testfiles/tstr.h5.xml b/tools/testfiles/tstr.h5.xml index 8c2f2a7..c82bbc6 100644 --- a/tools/testfiles/tstr.h5.xml +++ b/tools/testfiles/tstr.h5.xml @@ -24,8 +24,8 @@ Expected output for 'h5dump --xml tstr.h5' <hdf5:Field FieldName="int_array"> <hdf5:DataType> <hdf5:ArrayType Ndims="2"> - <hdf5:ArrayDimension DimSize="8" DimPerm="0"/> - <hdf5:ArrayDimension DimSize="10" DimPerm="1"/> + <hdf5:ArrayDimension DimSize="8"/> + <hdf5:ArrayDimension DimSize="10"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" /> @@ -37,8 +37,8 @@ Expected output for 'h5dump --xml tstr.h5' <hdf5:Field FieldName="string"> <hdf5:DataType> <hdf5:ArrayType Ndims="2"> - <hdf5:ArrayDimension DimSize="3" DimPerm="0"/> - <hdf5:ArrayDimension DimSize="4" DimPerm="1"/> + <hdf5:ArrayDimension DimSize="3"/> + <hdf5:ArrayDimension DimSize="4"/> <hdf5:DataType> <hdf5:AtomicType> <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="32" StrPad="H5T_STR_SPACEPAD"/> |