From 38309fb3f68ad3fd6bb07da6f6d4d1be1a146855 Mon Sep 17 00:00:00 2001 From: Ruey-Hsia Li Date: Mon, 21 Dec 1998 17:34:42 -0500 Subject: [svn-r982] Added test for loop detection. Updated expected output for dumper automatic tests. Removed redundant tests. --- tools/testfiles/tall-1.ddl | 60 +++++++------ tools/testfiles/tall-2.ddl | 20 ++--- tools/testfiles/tall-3.ddl | 4 +- tools/testfiles/tattr-1.ddl | 28 ++++--- tools/testfiles/tattr-2.ddl | 27 ++++-- tools/testfiles/tattr-3.ddl | 9 +- tools/testfiles/tattr-4.ddl | 12 --- tools/testfiles/tcomp-1.ddl | 98 +++++++++++++--------- tools/testfiles/tcomp-2.ddl | 12 +-- tools/testfiles/tcomp-3.ddl | 66 +++------------ tools/testfiles/tcomp-4.ddl | 19 ----- tools/testfiles/tdset-1.ddl | 195 +++++++++++++++++++++++-------------------- tools/testfiles/tdset-2.ddl | 100 ++-------------------- tools/testfiles/tdset-3.ddl | 9 -- tools/testfiles/tdset-4.ddl | 8 -- tools/testfiles/tgroup-2.ddl | 15 +++- tools/testfiles/tgroup-3.ddl | 18 ---- tools/testfiles/thlink-1.ddl | 10 +-- tools/testfiles/thlink-2.ddl | 18 ++-- tools/testfiles/thlink-3.ddl | 18 ++-- tools/testfiles/thlink-4.ddl | 6 +- tools/testfiles/thlink-5.ddl | 21 ++--- tools/testfiles/tloop-1.ddl | 17 ++++ tools/testfiles/tslink-1.ddl | 2 +- 24 files changed, 349 insertions(+), 443 deletions(-) delete mode 100644 tools/testfiles/tattr-4.ddl delete mode 100644 tools/testfiles/tcomp-4.ddl delete mode 100644 tools/testfiles/tdset-3.ddl delete mode 100644 tools/testfiles/tdset-4.ddl delete mode 100644 tools/testfiles/tgroup-3.ddl create mode 100644 tools/testfiles/tloop-1.ddl diff --git a/tools/testfiles/tall-1.ddl b/tools/testfiles/tall-1.ddl index 9ea5a73..9ad8cff 100644 --- a/tools/testfiles/tall-1.ddl +++ b/tools/testfiles/tall-1.ddl @@ -4,53 +4,58 @@ Expected output for 'h5dump tall.h5' HDF5 "tall.h5" { GROUP "/" { ATTRIBUTE "attr1" { - DATATYPE { "H5T_STD_I8LE" } - DATASPACE { ARRAY ( 10 ) ( 10 ) } + DATATYPE { H5T_STD_I8LE } + DATASPACE { SIMPLE ( 10 ) / ( 10 ) } DATA { "abcdefghi\000" } } ATTRIBUTE "attr2" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 2, 2 ) ( 2, 2 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 2, 2 ) / ( 2, 2 ) } DATA { - 0, 1, 2, 3 + 0, 1, + 2, 3 } } GROUP "g1" { GROUP "g1.1" { DATASET "dset1.1.1" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 10, 10 ) ( 10, 10 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 10, 10 ) / ( 10, 10 ) } DATA { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, - 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, - 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, - 5, 6, 7, 8, 9 + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 } ATTRIBUTE "attr1" { - DATATYPE { "H5T_STD_I8LE" } - DATASPACE { ARRAY ( 27 ) ( 27 ) } + DATATYPE { H5T_STD_I8LE } + DATASPACE { SIMPLE ( 27 ) / ( 27 ) } DATA { "1st attribute of dset1.1.1\000" } } ATTRIBUTE "attr2" { - DATATYPE { "H5T_STD_I8LE" } - DATASPACE { ARRAY ( 27 ) ( 27 ) } + DATATYPE { H5T_STD_I8LE } + DATASPACE { SIMPLE ( 27 ) / ( 27 ) } DATA { "2nd attribute of dset1.1.1\000" } } } DATASET "dset1.1.2" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 20 ) ( 20 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 20 ) / ( 20 ) } DATA { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19 + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19 } } } @@ -64,18 +69,19 @@ GROUP "/" { } GROUP "g2" { DATASET "dset2.1" { - DATATYPE { "H5T_IEEE_F32BE" } - DATASPACE { ARRAY ( 10 ) ( 10 ) } + DATATYPE { H5T_IEEE_F32BE } + DATASPACE { SIMPLE ( 10 ) / ( 10 ) } DATA { 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9 } } DATASET "dset2.2" { - DATATYPE { "H5T_IEEE_F32BE" } - DATASPACE { ARRAY ( 3, 5 ) ( 3, 5 ) } + DATATYPE { H5T_IEEE_F32BE } + DATASPACE { SIMPLE ( 3, 5 ) / ( 3, 5 ) } DATA { - 0, 0, 0, 0, 0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.2, 0.2, 0.2, 0.2, - 0.2 + 0, 0, 0, 0, 0, + 0.1, 0.1, 0.1, 0.1, 0.1, + 0.2, 0.2, 0.2, 0.2, 0.2 } } } diff --git a/tools/testfiles/tall-2.ddl b/tools/testfiles/tall-2.ddl index 4d6002b..d19519a 100644 --- a/tools/testfiles/tall-2.ddl +++ b/tools/testfiles/tall-2.ddl @@ -4,24 +4,24 @@ Expected output for 'h5dump -header -g /g1/g1.1 -a attr2 tall.h5' HDF5 "tall.h5" { GROUP "/g1/g1.1" { DATASET "dset1.1.1" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 10, 10 ) ( 10, 10 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 10, 10 ) / ( 10, 10 ) } ATTRIBUTE "attr1" { - DATATYPE { "H5T_STD_I8LE" } - DATASPACE { ARRAY ( 27 ) ( 27 ) } + DATATYPE { H5T_STD_I8LE } + DATASPACE { SIMPLE ( 27 ) / ( 27 ) } } ATTRIBUTE "attr2" { - DATATYPE { "H5T_STD_I8LE" } - DATASPACE { ARRAY ( 27 ) ( 27 ) } + DATATYPE { H5T_STD_I8LE } + DATASPACE { SIMPLE ( 27 ) / ( 27 ) } } } DATASET "dset1.1.2" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 20 ) ( 20 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 20 ) / ( 20 ) } } } ATTRIBUTE "attr2" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 2, 2 ) ( 2, 2 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 2, 2 ) / ( 2, 2 ) } } } diff --git a/tools/testfiles/tall-3.ddl b/tools/testfiles/tall-3.ddl index 9c35fe1..8fffb5c 100644 --- a/tools/testfiles/tall-3.ddl +++ b/tools/testfiles/tall-3.ddl @@ -3,8 +3,8 @@ Expected output for 'h5dump -d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink tall.h5' ############################# HDF5 "tall.h5" { DATASET "/g2/dset2.1" { - DATATYPE { "H5T_IEEE_F32BE" } - DATASPACE { ARRAY ( 10 ) ( 10 ) } + DATATYPE { H5T_IEEE_F32BE } + DATASPACE { SIMPLE ( 10 ) / ( 10 ) } DATA { 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9 } diff --git a/tools/testfiles/tattr-1.ddl b/tools/testfiles/tattr-1.ddl index 996b70a..8a45514 100644 --- a/tools/testfiles/tattr-1.ddl +++ b/tools/testfiles/tattr-1.ddl @@ -4,38 +4,44 @@ Expected output for 'h5dump tattr.h5' HDF5 "tattr.h5" { GROUP "/" { ATTRIBUTE "attr1" { - DATATYPE { "H5T_STD_I8LE" } - DATASPACE { ARRAY ( 24 ) ( 24 ) } + DATATYPE { H5T_STD_I8LE } + DATASPACE { SIMPLE ( 24 ) / ( 24 ) } DATA { "attribute of root group\000" } } ATTRIBUTE "attr2" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 10 ) ( 10 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 10 ) / ( 10 ) } DATA { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 } } ATTRIBUTE "attr3" { - DATATYPE { "H5T_IEEE_F64BE" } - DATASPACE { ARRAY ( 10 ) ( 10 ) } + DATATYPE { H5T_IEEE_F64BE } + DATASPACE { SIMPLE ( 10 ) / ( 10 ) } DATA { 0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9 } } ATTRIBUTE "attr4" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 0 ) ( 0 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SCALAR } DATA { 100 } } ATTRIBUTE "attr5" { - DATATYPE { "undefined string" } - DATASPACE { ARRAY ( 0 ) ( 0 ) } + DATATYPE { + { STRSIZE 17; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + } + DATASPACE { SCALAR } DATA { - Unable to print data. + "string attribute\000" } } } diff --git a/tools/testfiles/tattr-2.ddl b/tools/testfiles/tattr-2.ddl index 7b6a7c9..8fbdebf 100644 --- a/tools/testfiles/tattr-2.ddl +++ b/tools/testfiles/tattr-2.ddl @@ -1,19 +1,32 @@ ############################# -Expected output for 'h5dump -a attr1 attr3 tattr.h5' +Expected output for 'h5dump -a attr1 attr4 attr5 tattr.h5' ############################# HDF5 "tattr.h5" { ATTRIBUTE "attr1" { - DATATYPE { "H5T_STD_I8LE" } - DATASPACE { ARRAY ( 24 ) ( 24 ) } + DATATYPE { H5T_STD_I8LE } + DATASPACE { SIMPLE ( 24 ) / ( 24 ) } DATA { "attribute of root group\000" } } -ATTRIBUTE "attr3" { - DATATYPE { "H5T_IEEE_F64BE" } - DATASPACE { ARRAY ( 10 ) ( 10 ) } +ATTRIBUTE "attr4" { + DATATYPE { H5T_STD_I32BE } + DATASPACE { SCALAR } DATA { - 0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9 + 100 + } +} +ATTRIBUTE "attr5" { + DATATYPE { + { STRSIZE 17; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + } + DATASPACE { SCALAR } + DATA { + "string attribute\000" } } } diff --git a/tools/testfiles/tattr-3.ddl b/tools/testfiles/tattr-3.ddl index 0ef4a4f..b0c600f 100644 --- a/tools/testfiles/tattr-3.ddl +++ b/tools/testfiles/tattr-3.ddl @@ -1,9 +1,12 @@ ############################# -Expected output for 'h5dump -header -a attr2 tattr.h5' +Expected output for 'h5dump -header -a attr2 attr tattr.h5' ############################# HDF5 "tattr.h5" { ATTRIBUTE "attr2" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 10 ) ( 10 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 10 ) / ( 10 ) } +} +ATTRIBUTE "attr" { + h5dump error: unable to open attribute. } } diff --git a/tools/testfiles/tattr-4.ddl b/tools/testfiles/tattr-4.ddl deleted file mode 100644 index 77c888c..0000000 --- a/tools/testfiles/tattr-4.ddl +++ /dev/null @@ -1,12 +0,0 @@ -############################# -Expected output for 'h5dump -a attr4 tattr.h5' -############################# -HDF5 "tattr.h5" { -ATTRIBUTE "attr4" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 0 ) ( 0 ) } - DATA { - 100 - } -} -} diff --git a/tools/testfiles/tcomp-1.ddl b/tools/testfiles/tcomp-1.ddl index 0f1c79f..7c6ab7c 100644 --- a/tools/testfiles/tcomp-1.ddl +++ b/tools/testfiles/tcomp-1.ddl @@ -4,88 +4,104 @@ Expected output for 'h5dump tcompound.h5' HDF5 "tcompound.h5" { GROUP "/" { DATATYPE "#5992:0" { - H5T_STD_I32BE int; - H5T_IEEE_F32BE float; + H5T_STD_I32BE "int"; + H5T_IEEE_F32BE "float"; } DATASET "dset1" { DATATYPE { - H5T_STD_I32BE a_name; - H5T_IEEE_F32BE b_name; - H5T_IEEE_F64BE c_name; + H5T_STD_I32BE "a_name"; + H5T_IEEE_F32BE "b_name"; + H5T_IEEE_F64BE "c_name"; } - DATASPACE { ARRAY ( 5 ) ( 5 ) } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { - {0,0,1}, {1,1,0.5}, {2,4,0.333333}, {3,9,0.25}, {4,16,0.2} + {0,0,1} + {1,1,0.5} + {2,4,0.333333} + {3,9,0.25} + {4,16,0.2} } } GROUP "group1" { DATASET "dset2" { DATATYPE { - HARDLINK { "/type1" } + "/type1" } - DATASPACE { ARRAY ( 5 ) ( 5 ) } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { - {0,0}, {1,1.1}, {2,2.2}, {3,3.3}, {4,4.4} + {0,0} + {1,1.1} + {2,2.2} + {3,3.3} + {4,4.4} } } DATASET "dset3" { DATATYPE { - HARDLINK { "/type2" } + "/type2" } - DATASPACE { ARRAY ( 3, 6 ) ( 3, 6 ) } + DATASPACE { SIMPLE ( 3, 6 ) / ( 3, 6 ) } DATA { - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} } } DATASET "dset4" { DATATYPE { - HARDLINK { "/group1/type3" } + "/group1/type3" } - DATASPACE { ARRAY ( 5 ) ( 5 ) } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { - {0,0}, {1,1}, {2,2}, {3,3}, {4,4} + {0,0} + {1,1} + {2,2} + {3,3} + {4,4} } } DATATYPE "type3" { - H5T_STD_I32BE int; - H5T_IEEE_F32BE float; + H5T_STD_I32BE "int"; + H5T_IEEE_F32BE "float"; } } GROUP "group2" { DATASET "dset5" { DATATYPE { - HARDLINK { "#5992:0" } + "#5992:0" } - DATASPACE { ARRAY ( 5 ) ( 5 ) } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { - {0,0}, {1,0.1}, {2,0.2}, {3,0.3}, {4,0.4} + {0,0} + {1,0.1} + {2,0.2} + {3,0.3} + {4,0.4} } } } DATATYPE "type1" { - H5T_STD_I32BE int_name; - H5T_IEEE_F32BE float_name; + H5T_STD_I32BE "int_name"; + H5T_IEEE_F32BE "float_name"; } DATATYPE "type2" { - H5T_STD_I32BE int_array[4]; - H5T_IEEE_F32BE float_array[5][6]; + H5T_STD_I32BE "int_array"[4]; + H5T_IEEE_F32BE "float_array"[5][6]; } } } diff --git a/tools/testfiles/tcomp-2.ddl b/tools/testfiles/tcomp-2.ddl index d3c27df..dd39a65 100644 --- a/tools/testfiles/tcomp-2.ddl +++ b/tools/testfiles/tcomp-2.ddl @@ -3,15 +3,15 @@ Expected output for 'h5dump -t /type1 /type2 /group1/type3 tcompound.h5' ############################# HDF5 "tcompound.h5" { DATATYPE "/type1" { - H5T_STD_I32BE int_name; - H5T_IEEE_F32BE float_name; + H5T_STD_I32BE "int_name"; + H5T_IEEE_F32BE "float_name"; } DATATYPE "/type2" { - H5T_STD_I32BE int_array[4]; - H5T_IEEE_F32BE float_array[5][6]; + H5T_STD_I32BE "int_array"[4]; + H5T_IEEE_F32BE "float_array"[5][6]; } DATATYPE "/group1/type3" { - H5T_STD_I32BE int; - H5T_IEEE_F32BE float; + H5T_STD_I32BE "int"; + H5T_IEEE_F32BE "float"; } } diff --git a/tools/testfiles/tcomp-3.ddl b/tools/testfiles/tcomp-3.ddl index ebbc895..1a1d74b 100644 --- a/tools/testfiles/tcomp-3.ddl +++ b/tools/testfiles/tcomp-3.ddl @@ -1,64 +1,24 @@ ############################# -Expected output for 'h5dump -d /group2/dset5 -g /group1 tcompound.h5' +Expected output for 'h5dump -t /#5992:0 -g /group2 tcompound.h5' ############################# HDF5 "tcompound.h5" { -DATASET "/group2/dset5" { - DATATYPE { - HARDLINK { "#5992:0" } - } - DATASPACE { ARRAY ( 5 ) ( 5 ) } - DATA { - {0,0}, {1,0.1}, {2,0.2}, {3,0.3}, {4,0.4} - } +DATATYPE "/#5992:0" { + H5T_STD_I32BE "int"; + H5T_IEEE_F32BE "float"; } -GROUP "/group1" { - DATASET "dset2" { - DATATYPE { - HARDLINK { "/type1" } - } - DATASPACE { ARRAY ( 5 ) ( 5 ) } - DATA { - {0,0}, {1,1.1}, {2,2.2}, {3,3.3}, {4,4.4} - } - } - DATASET "dset3" { +GROUP "/group2" { + DATASET "dset5" { DATATYPE { - HARDLINK { "/type2" } + "#5992:0" } - DATASPACE { ARRAY ( 3, 6 ) ( 3, 6 ) } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}, - {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]} + {0,0} + {1,0.1} + {2,0.2} + {3,0.3} + {4,0.4} } } - DATASET "dset4" { - DATATYPE { - HARDLINK { "/group1/type3" } - } - DATASPACE { ARRAY ( 5 ) ( 5 ) } - DATA { - {0,0}, {1,1}, {2,2}, {3,3}, {4,4} - } - } - DATATYPE "type3" { - H5T_STD_I32BE int; - H5T_IEEE_F32BE float; - } } } diff --git a/tools/testfiles/tcomp-4.ddl b/tools/testfiles/tcomp-4.ddl deleted file mode 100644 index 80ed997..0000000 --- a/tools/testfiles/tcomp-4.ddl +++ /dev/null @@ -1,19 +0,0 @@ -############################# -Expected output for 'h5dump -t /#3432:0 -g /group2 tcompound.h5' -############################# -HDF5 "tcompound.h5" { -DATATYPE "/#3432:0" { - h5dump error: unable to open /#3432:0 -} -GROUP "/group2" { - DATASET "dset5" { - DATATYPE { - HARDLINK { "#5992:0" } - } - DATASPACE { ARRAY ( 5 ) ( 5 ) } - DATA { - {0,0}, {1,0.1}, {2,0.2}, {3,0.3}, {4,0.4} - } - } -} -} diff --git a/tools/testfiles/tdset-1.ddl b/tools/testfiles/tdset-1.ddl index 8eb043e..f95ed91 100644 --- a/tools/testfiles/tdset-1.ddl +++ b/tools/testfiles/tdset-1.ddl @@ -4,102 +4,115 @@ Expected output for 'h5dump tdset.h5' HDF5 "tdset.h5" { GROUP "/" { DATASET "dset1" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 10, 20 ) ( 10, 20 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 10, 20 ) / ( 10, 20 ) } DATA { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 0, 1, 2, 3, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 0, 1, - 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19 + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 } } DATASET "dset2" { - DATATYPE { "H5T_IEEE_F64BE" } - DATASPACE { ARRAY ( 30, 20 ) ( 30, 20 ) } + DATATYPE { H5T_IEEE_F64BE } + DATASPACE { SIMPLE ( 30, 20 ) / ( 30, 20 ) } DATA { - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019 + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019 + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019 + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019 + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019 + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019, + 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, + 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, + 0.0018, 0.0019 } } } diff --git a/tools/testfiles/tdset-2.ddl b/tools/testfiles/tdset-2.ddl index 735b28a..a857c9d 100644 --- a/tools/testfiles/tdset-2.ddl +++ b/tools/testfiles/tdset-2.ddl @@ -1,100 +1,16 @@ ############################# -Expected output for 'h5dump -d dset1 /dset2 tdset.h5' +Expected output for 'h5dump -header -d dset1 /dset2 dset3 tdset.h5' ############################# HDF5 "tdset.h5" { DATASET "dset1" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 10, 20 ) ( 10, 20 ) } - DATA { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 - } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 10, 20 ) / ( 10, 20 ) } } DATASET "/dset2" { - DATATYPE { "H5T_IEEE_F64BE" } - DATASPACE { ARRAY ( 30, 20 ) ( 30, 20 ) } - DATA { - 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, - 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, - 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, - 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, - 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, - 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, - 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, - 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, - 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, - 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, - 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, - 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, - 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, - 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, - 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, - 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, - 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, - 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, - 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, - 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, - 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, - 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, - 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, - 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, - 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, - 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, - 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, - 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, - 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, - 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, - 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, - 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, - 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, - 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, - 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, - 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, - 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, - 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, - 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, - 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, - 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, - 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, - 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, - 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, - 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, - 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, - 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, - 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, - 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, - 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, - 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, - 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, - 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, - 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, - 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, - 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, - 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, - 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, - 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, - 0.0018, 0.0019 - } + DATATYPE { H5T_IEEE_F64BE } + DATASPACE { SIMPLE ( 30, 20 ) / ( 30, 20 ) } +} +DATASET "dset3" { + h5dump error: unable to open dset3 } } diff --git a/tools/testfiles/tdset-3.ddl b/tools/testfiles/tdset-3.ddl deleted file mode 100644 index 86d640b..0000000 --- a/tools/testfiles/tdset-3.ddl +++ /dev/null @@ -1,9 +0,0 @@ -############################# -Expected output for 'h5dump -d /dset1 -header tdset.h5' -############################# -HDF5 "tdset.h5" { -DATASET "/dset1" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 10, 20 ) ( 10, 20 ) } -} -} diff --git a/tools/testfiles/tdset-4.ddl b/tools/testfiles/tdset-4.ddl deleted file mode 100644 index c86c776..0000000 --- a/tools/testfiles/tdset-4.ddl +++ /dev/null @@ -1,8 +0,0 @@ -############################# -Expected output for 'h5dump -d dset3 tdset.h5' -############################# -HDF5 "tdset.h5" { -DATASET "dset3" { - h5dump error: unable to open dset3 -} -} diff --git a/tools/testfiles/tgroup-2.ddl b/tools/testfiles/tgroup-2.ddl index 42011a7..86a33f1 100644 --- a/tools/testfiles/tgroup-2.ddl +++ b/tools/testfiles/tgroup-2.ddl @@ -1,7 +1,17 @@ ############################# -Expected output for 'h5dump -g / tgroup.h5' +Expected output for 'h5dump -g /g2 / /y tgroup.h5' ############################# HDF5 "tgroup.h5" { +GROUP "/g2" { + GROUP "g2.1" { + GROUP "g2.1.1" { + } + GROUP "g2.1.2" { + } + GROUP "g2.1.3" { + } + } +} GROUP "/" { GROUP "g1" { GROUP "g1.1" { @@ -30,4 +40,7 @@ GROUP "/" { } } } +GROUP "/y" { + h5dump error: unable to open /y +} } diff --git a/tools/testfiles/tgroup-3.ddl b/tools/testfiles/tgroup-3.ddl deleted file mode 100644 index 31ee9ce..0000000 --- a/tools/testfiles/tgroup-3.ddl +++ /dev/null @@ -1,18 +0,0 @@ -############################# -Expected output for 'h5dump -g /g2 /y tgroup.h5' -############################# -HDF5 "tgroup.h5" { -GROUP "/g2" { - GROUP "g2.1" { - GROUP "g2.1.1" { - } - GROUP "g2.1.2" { - } - GROUP "g2.1.3" { - } - } -} -GROUP "/y" { - h5dump error: unable to open /y -} -} diff --git a/tools/testfiles/thlink-1.ddl b/tools/testfiles/thlink-1.ddl index 7bf0a3a..c2ab358 100644 --- a/tools/testfiles/thlink-1.ddl +++ b/tools/testfiles/thlink-1.ddl @@ -4,24 +4,24 @@ Expected output for 'h5dump thlink.h5' HDF5 "thlink.h5" { GROUP "/" { DATASET "dset1" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 5 ) ( 5 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { 0, 1, 2, 3, 4 } } GROUP "g1" { DATASET "dset2" { - HARDLINK { "/dset1" } + HARDLINK "/dset1" } GROUP "g1.1" { DATASET "dset3" { - HARDLINK { "/dset1" } + HARDLINK "/dset1" } } } GROUP "g2" { - HARDLINK { "/g1/g1.1" } + HARDLINK "/g1/g1.1" } } } diff --git a/tools/testfiles/thlink-2.ddl b/tools/testfiles/thlink-2.ddl index d11b381..c6ecfc5 100644 --- a/tools/testfiles/thlink-2.ddl +++ b/tools/testfiles/thlink-2.ddl @@ -1,14 +1,18 @@ ############################# -Expected output for 'h5dump -d /g1/link2 /dset /g1/link1/link3 thlink.h5' +Expected output for 'h5dump -d /g1/dset2 /dset1 /g1/g1.1/dset3 thlink.h5' ############################# HDF5 "thlink.h5" { -DATASET "/g1/link2" { - h5dump error: unable to open /g1/link2 +DATASET "/g1/dset2" { + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATA { + 0, 1, 2, 3, 4 + } } -DATASET "/dset" { - h5dump error: unable to open /dset +DATASET "/dset1" { + HARDLINK "/g1/dset2" } -DATASET "/g1/link1/link3" { - h5dump error: unable to open /g1/link1/link3 +DATASET "/g1/g1.1/dset3" { + HARDLINK "/g1/dset2" } } diff --git a/tools/testfiles/thlink-3.ddl b/tools/testfiles/thlink-3.ddl index ab18d94..a5d27d8 100644 --- a/tools/testfiles/thlink-3.ddl +++ b/tools/testfiles/thlink-3.ddl @@ -1,14 +1,18 @@ ############################# -Expected output for 'h5dump -d /dset /g1/link1/link3 /g1/link2 thlink.h5' +Expected output for 'h5dump -d /g1/g1.1/dset3 /g1/dset2 /dset1 thlink.h5' ############################# HDF5 "thlink.h5" { -DATASET "/dset" { - h5dump error: unable to open /dset +DATASET "/g1/g1.1/dset3" { + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATA { + 0, 1, 2, 3, 4 + } } -DATASET "/g1/link1/link3" { - h5dump error: unable to open /g1/link1/link3 +DATASET "/g1/dset2" { + HARDLINK "/g1/g1.1/dset3" } -DATASET "/g1/link2" { - h5dump error: unable to open /g1/link2 +DATASET "/dset1" { + HARDLINK "/g1/g1.1/dset3" } } diff --git a/tools/testfiles/thlink-4.ddl b/tools/testfiles/thlink-4.ddl index 669e8e9..1a883d0 100644 --- a/tools/testfiles/thlink-4.ddl +++ b/tools/testfiles/thlink-4.ddl @@ -4,15 +4,15 @@ Expected output for 'h5dump -g /g1 thlink.h5' HDF5 "thlink.h5" { GROUP "/g1" { DATASET "dset2" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 5 ) ( 5 ) } + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } DATA { 0, 1, 2, 3, 4 } } GROUP "g1.1" { DATASET "dset3" { - HARDLINK { "/g1/dset2" } + HARDLINK "/g1/dset2" } } } diff --git a/tools/testfiles/thlink-5.ddl b/tools/testfiles/thlink-5.ddl index 9961862..9ad7b6c 100644 --- a/tools/testfiles/thlink-5.ddl +++ b/tools/testfiles/thlink-5.ddl @@ -1,20 +1,21 @@ ############################# -Expected output for 'h5dump -d /dset -g /g2 -d /g1/link2 thlink.h5' +Expected output for +'h5dump -d /dset1 -g /g2 -d /g1/dset2 thlink.h5' ############################# HDF5 "thlink.h5" { -DATASET "/dset" { - h5dump error: unable to open /dset +DATASET "/dset1" { + DATATYPE { H5T_STD_I32BE } + DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATA { + 0, 1, 2, 3, 4 + } } GROUP "/g2" { DATASET "dset3" { - DATATYPE { "H5T_STD_I32BE" } - DATASPACE { ARRAY ( 5 ) ( 5 ) } - DATA { - 0, 1, 2, 3, 4 - } + HARDLINK "/dset1" } } -DATASET "/g1/link2" { - h5dump error: unable to open /g1/link2 +DATASET "/g1/dset2" { + HARDLINK "/dset1" } } diff --git a/tools/testfiles/tloop-1.ddl b/tools/testfiles/tloop-1.ddl new file mode 100644 index 0000000..8313887 --- /dev/null +++ b/tools/testfiles/tloop-1.ddl @@ -0,0 +1,17 @@ +############################# +Expected output for 'h5dump tloop.h5' +############################# +HDF5 "tloop.h5" { +GROUP "/" { + GROUP "g1" { + GROUP "g1.1" { + GROUP "g2.1" { + HARDLINK "/g1" + } + } + } + GROUP "g2" { + HARDLINK "/g1/g1.1" + } +} +} diff --git a/tools/testfiles/tslink-1.ddl b/tools/testfiles/tslink-1.ddl index e0f24e0..218ca8b 100644 --- a/tools/testfiles/tslink-1.ddl +++ b/tools/testfiles/tslink-1.ddl @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5dump tslink.h5' +Expected output for 'h5dump tslink.h5' ############################# HDF5 "tslink.h5" { GROUP "/" { -- cgit v0.12