mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-21 01:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r14172]

Browse Source 
1)	added 5 new tests for the group creation order
2)	modified the h5dump test script to automatically generated non existing (new) output files
3)	cleaning of unused DDL files
4)	new modified DDL files include tcomp-3.ddl ( new form of named datatype) and the binary output files

tested : linux
This commit is contained in:
Pedro Vicente Nunes 2007-10-02 11:45:46 -05:00
parent 12c7f7b6da
commit d0bcb06e7a
19 changed files with 194 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MANIFEST
View File

@ -1064,7 +1064,6 @@
./tools/testfiles/tattr-2.ddl
./tools/testfiles/tattr-3.ddl
./tools/testfiles/tattr.h5
./tools/testfiles/tbitfields-1.ddl
./tools/testfiles/tbitfields.h5
./tools/testfiles/tchar.h5
./tools/testfiles/tchar1.ddl
@ -1081,13 +1080,11 @@
./tools/testfiles/tdset-2.ddl
./tools/testfiles/tdset-3s.ddl
./tools/testfiles/tdset.h5
./tools/testfiles/tdset2-1s.ddl
./tools/testfiles/tdset2.h5
./tools/testfiles/tempty.ddl
./tools/testfiles/tempty.h5
./tools/testfiles/tempty.ls
./tools/testfiles/tenum.h5
./tools/testfiles/tenum.ddl
./tools/testfiles/textlink.h5
./tools/testfiles/textlink.h5.xml
./tools/testfiles/textlink-1.ls
@ -1136,9 +1133,7 @@
./tools/testfiles/tnullspace.h5
./tools/testfiles/tnullspace.ddl
./tools/testfiles/tobjref.h5
./tools/testfiles/tobjref.ddl
./tools/testfiles/topaque.h5
./tools/testfiles/topaque.ddl
./tools/testfiles/tsaf.ddl
./tools/testfiles/tsaf.h5
./tools/testfiles/tscaleoffset.ddl
@ -1212,7 +1207,6 @@
./tools/testfiles/tindicessub3.ddl
./tools/testfiles/tindicessub4.ddl
./tools/testfiles/tindicessub1.ddl
./tools/testfiles/tregref.ddl
./tools/testfiles/thyperslab.ddl
./tools/testfiles/tbigdims.ddl
./tools/testfiles/tbigdims.h5
@ -1220,6 +1214,11 @@
# h5dump h5import validation
./tools/testfiles/out3.h5import
./tools/testfiles/tordergr.h5
./tools/testfiles/tordergr3.ddl
./tools/testfiles/tordergr4.ddl
./tools/testfiles/tordergr1.ddl
./tools/testfiles/tordergr5.ddl
./tools/testfiles/tordergr2.ddl

52
tools/h5dump/testh5dump.sh.in
View File

@ -73,31 +73,31 @@ TOOLTEST() {
# Run test.
TESTING $DUMPER $@
(
cd $srcdir/../testfiles
$RUNSERIAL $DUMPER_BIN $@
echo "#############################"
echo "Expected output for '$DUMPER $@'"
echo "#############################"
cd $srcdir/../testfiles
$RUNSERIAL $DUMPER_BIN $@
) >$actual 2>$actual_err
cat $actual_err >> $actual
if [ ! -f $expect ]; then
echo "*FAILED*"
echo " $expect missing"
nerrors="`expr $nerrors + 1`"
if [ ! -f $expect ]; then
# Create the expect file if it doesn't yet exist.
echo " CREATED"
cp $actual $expect
elif $CMP $expect $actual; then
echo " PASSED"
else
# Skip the first three lines, which are label lines, before cmp.
if tail +4l $expect | $CMP - $actual; then
echo " PASSED"
else
echo "*FAILED*"
echo " Expected result (*.ddl) differs from actual result (*.out)"
nerrors="`expr $nerrors + 1`"
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
fi
echo "*FAILED*"
echo " Expected result (*.ddl) differs from actual result (*.out)"
nerrors="`expr $nerrors + 1`"
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
fi
# Clean up output file
if test -z "$HDF5_NOCLEANUP"; then
rm -f $actual $actual_err
fi
# if test -z "$HDF5_NOCLEANUP"; then
# rm -f $actual $actual_err
# fi
}
@ -179,7 +179,7 @@ IMPORTTEST()
##############################################################################
##############################################################################
### T H E T E S T S ###
### T H E T E S T S ###
##############################################################################
##############################################################################
@ -221,7 +221,7 @@ TOOLTEST tcomp-1.ddl tcompound.h5
# test for named data types
TOOLTEST tcomp-2.ddl -t /type1 --datatype /type2 --datatype=/group1/type3 tcompound.h5
# test for unamed type
TOOLTEST tcomp-3.ddl -t /#6632:0 -g /group2 tcompound.h5
TOOLTEST tcomp-3.ddl -t /#6632 -g /group2 tcompound.h5
# test complicated compound datatype
TOOLTEST tcomp-4.ddl tcompound_complex.h5
@ -416,7 +416,7 @@ TOOLTEST tnullspace.ddl tnullspace.h5
TOOLTEST tvms.ddl tvms.h5
# test for binary output
TOOLTEST tbin1.ddl -d array -o $TESTDIR/out1.bin -b LE tbinary.h5
TOOLTEST tbin1.ddl -d integer -o $TESTDIR/out1.bin -b LE tbinary.h5
TOOLTEST tbin2.ddl -d float -o $TESTDIR/out2.bin -b BE tbinary.h5
# the MEMORY test can be validated with h5import/h5diff
@ -434,7 +434,15 @@ fi
# test for dataset region references
TOOLTEST tregref.ddl tdatareg.h5
TOOLTEST tdatareg.ddl tdatareg.h5
# tests for group creation order
# "1" tracked, "2" name, root tracked
TOOLTEST tordergr1.ddl --group=1 --sort_by=creation_order --sort_order=ascending tordergr.h5
TOOLTEST tordergr2.ddl --group=1 --sort_by=creation_order --sort_order=descending tordergr.h5
TOOLTEST tordergr3.ddl -g 2 -q name -z ascending tordergr.h5
TOOLTEST tordergr4.ddl -g 2 -q name -z descending tordergr.h5
TOOLTEST tordergr5.ddl -q creation_order tordergr.h5
if test $nerrors -eq 0 ; then

11
tools/testfiles/tbin1.ddl
View File

@ -1,12 +1,11 @@
#############################
Expected output for 'h5dump -d array -o out1.bin -b LE tbinary.h5'
Expected output for 'h5dump -d integer -o /home/pvn/kagiso/build_hdf5/tools/h5dump/../testfiles/out1.bin -b LE tbinary.h5'
#############################
HDF5 "tbinary.h5" {
DATASET "array" {
DATATYPE H5T_ARRAY { [6] H5T_STD_I32LE }
DATASPACE SIMPLE { ( 2 ) / ( 2 ) }
DATASET "integer" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
DATA {
}
}
}
}
h5dump error: unable to print data

2
tools/testfiles/tbin2.ddl
View File

@ -1,5 +1,5 @@
#############################
Expected output for 'h5dump -d float -o out2.bin -b BE tbinary.h5'
Expected output for 'h5dump -d float -o /home/pvn/kagiso/build_hdf5/tools/h5dump/../testfiles/out2.bin -b BE tbinary.h5'
#############################
HDF5 "tbinary.h5" {
DATASET "float" {

2
tools/testfiles/tbin3.ddl
View File

@ -1,5 +1,5 @@
#############################
Expected output for 'h5dump -d integer -o out3.bin -b MEMORY tbinary.h5'
Expected output for 'h5dump -d integer -o /home/pvn/kagiso/build_hdf5/tools/h5dump/../testfiles/out3.bin -b MEMORY tbinary.h5'
#############################
HDF5 "tbinary.h5" {
DATASET "integer" {

2
tools/testfiles/tbin4.ddl
View File

@ -1,5 +1,5 @@
#############################
Expected output for 'h5dump -d double -o out4.bin -b FILE tbinary.h5'
Expected output for 'h5dump -d double -o /home/pvn/kagiso/build_hdf5/tools/h5dump/../testfiles/out4.bin -b FILE tbinary.h5'
#############################
HDF5 "tbinary.h5" {
DATASET "double" {

26
tools/testfiles/tbitfields-1.ddl
View File

@ -1,26 +0,0 @@
#############################
Expected output for 'h5dump tbitfields.h5'
#############################
HDF5 "tbitfields.h5" {
GROUP "/" {
GROUP "typetests" {
DATASET "bitfield_1" {
DATATYPE { H5T_STD_B8LE }
DATASPACE { SIMPLE ( 32 ) / ( 32 ) }
DATA {
0xff, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xf9, 0xf8, 0xf7, 0xf6, 0xf5,
0xf4, 0xf3, 0xf2, 0xf1, 0xf0, 0xef, 0xee, 0xed, 0xec, 0xeb, 0xea,
0xe9, 0xe8, 0xe7, 0xe6, 0xe5, 0xe4, 0xe3, 0xe2, 0xe1, 0xe0
}
}
DATASET "bitfield_2" {
DATATYPE { H5T_STD_B16LE }
DATASPACE { SIMPLE ( 16 ) / ( 16 ) }
DATA {
0xfffe, 0xfdfc, 0xfbfa, 0xf9f8, 0xf7f6, 0xf5f4, 0xf3f2, 0xf1f0,
0xefee, 0xedec, 0xebea, 0xe9e8, 0xe7e6, 0xe5e4, 0xe3e2, 0xe1e0
}
}
}
}
}

9
tools/testfiles/tcomp-3.ddl
View File

@ -1,9 +1,11 @@
#############################
Expected output for 'h5dump -t /#6632:0 -g /group2 tcompound.h5'
Expected output for 'h5dump -t /#6632 -g /group2 tcompound.h5'
#############################
HDF5 "tcompound.h5" {
DATATYPE "/#6632:0"
DATATYPE "/#6632" H5T_COMPOUND {
H5T_STD_I32BE "int";
H5T_IEEE_F32BE "float";
}
GROUP "/group2" {
DATASET "dset5" {
DATATYPE "/#6632"
@ -33,4 +35,3 @@ GROUP "/group2" {
}
}
}
h5dump error: unable to open datatype "/#6632:0"

45
tools/testfiles/tdatareg.ddl
View File

@ -4,28 +4,29 @@ Expected output for 'h5dump tdatareg.h5'
HDF5 "tdatareg.h5" {
GROUP "/" {
DATASET "Dataset1" {
DATATYPE { H5T_REFERENCE }
DATASPACE { SIMPLE ( 4 ) / ( 4 ) }
DATATYPE H5T_REFERENCE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
DATASET 0:744 {(2,2)-(7,7)}, DATASET 0:744 {(6,9), (2,2), (8,4), (1,6),
(2,8), (3,2), (0,4), (9,0), (7,1), (3,3)}, NULL, NULL
}
}
(0): DATASET /Dataset2 {(2,2)-(7,7)}, DATASET /Dataset2 {(6,9), (2,2),
(1): (8,4), (1,6), (2,8), (3,2), (0,4), (9,0), (7,1), (3,3)}, NULL,
(3): NULL
}
}
DATASET "Dataset2" {
DATATYPE { H5T_STD_U8LE }
DATASPACE { SIMPLE ( 10, 10 ) / ( 10, 10 ) }
DATATYPE H5T_STD_U8BE
DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
DATA {
0, 3, 6, 9, 12, 15, 18, 21, 24, 27,
30, 33, 36, 39, 42, 45, 48, 51, 54, 57,
60, 63, 66, 69, 72, 75, 78, 81, 84, 87,
90, 93, 96, 99, 102, 105, 108, 111, 114, 117,
120, 123, 126, 129, 132, 135, 138, 141, 144, 147,
150, 153, 156, 159, 162, 165, 168, 171, 174, 177,
180, 183, 186, 189, 192, 195, 198, 201, 204, 207,
210, 213, 216, 219, 222, 225, 228, 231, 234, 237,
240, 243, 246, 249, 252, 255, 2, 5, 8, 11,
14, 17, 20, 23, 26, 29, 32, 35, 38, 41
}
}
}
}
(0,0): 0, 3, 6, 9, 12, 15, 18, 21, 24, 27,
(1,0): 30, 33, 36, 39, 42, 45, 48, 51, 54, 57,
(2,0): 60, 63, 66, 69, 72, 75, 78, 81, 84, 87,
(3,0): 90, 93, 96, 99, 102, 105, 108, 111, 114, 117,
(4,0): 120, 123, 126, 129, 132, 135, 138, 141, 144, 147,
(5,0): 150, 153, 156, 159, 162, 165, 168, 171, 174, 177,
(6,0): 180, 183, 186, 189, 192, 195, 198, 201, 204, 207,
(7,0): 210, 213, 216, 219, 222, 225, 228, 231, 234, 237,
(8,0): 240, 243, 246, 249, 252, 255, 2, 5, 8, 11,
(9,0): 14, 17, 20, 23, 26, 29, 32, 35, 38, 41
}
}
}
}

21
tools/testfiles/tdset2-1s.ddl
View File

@ -1,21 +0,0 @@
#############################
Expected output for 'h5dump -d /dset1[;3,2;4,4;1,4] tdset2.h5'
#############################
HDF5 "tdset2.h5" {
DATASET "/dset1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 10, 20 ) / ( H5S_UNLIMITED, 20 ) }
SUBSET {
START ( 0, 0 );
STRIDE ( 3, 2 );
COUNT ( 4, 4 );
BLOCK ( 1, 4 );
DATA {
(0,0): 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3,
(0,2): 2, 3, 4, 5, 2, 3, 4, 5, 2, 3, 4, 5, 2, 3, 4, 5,
(0,4): 4, 5, 6, 7, 4, 5, 6, 7, 4, 5, 6, 7, 4, 5, 6, 7,
(0,6): 6, 7, 8, 9, 6, 7, 8, 9, 6, 7, 8, 9, 6, 7, 8, 9
}
}
}
}

27
tools/testfiles/tenum.ddl
View File

@ -1,27 +0,0 @@
#############################
Expected output for 'h5dump tenum.h5'
#############################
HDF5 "tenum.h5" {
GROUP "/" {
DATATYPE "enum normal" H5T_ENUM {
H5T_STD_I32LE;
"RED" 0;
"GREEN
green" 1;
"BLUE blue" 2;
"WHITE "white"" 3;
"BLACK 'black'" 4;
};
DATASET "table" {
DATATYPE "/enum normal"
DATASPACE SIMPLE { ( 20 ) / ( 20 ) }
DATA {
RED, GREEN\ngreen, BLUE blue, GREEN\ngreen, WHITE \"white\",
WHITE \"white\", BLACK \'black\', GREEN\ngreen, BLUE blue, RED, RED,
BLUE blue, GREEN\ngreen, BLACK \'black\', WHITE \"white\", RED,
WHITE \"white\", GREEN\ngreen, GREEN\ngreen, BLUE blue
}
}
}
}

32
tools/testfiles/tobjref.ddl
View File

@ -1,32 +0,0 @@
HDF5 "tobjref.h5" {
GROUP "/" {
DATASET "Dataset3" {
DATATYPE { H5T_REFERENCE }
DATASPACE { SIMPLE ( 4 ) / ( 4 ) }
DATA {
DATASET 0:1696, DATASET 0:2152, GROUP 0:1320, DATATYPE 0:2268
}
}
GROUP "Group1" {
DATASET "Dataset1" {
DATATYPE { H5T_STD_U32BE }
DATASPACE { SIMPLE ( 4 ) / ( 4 ) }
DATA {
0, 3, 6, 9
}
}
DATASET "Dataset2" {
DATATYPE { H5T_STD_U8BE }
DATASPACE { SIMPLE ( 4 ) / ( 4 ) }
DATA {
0, 0, 0, 0
}
}
DATATYPE "Datatype1" {
H5T_STD_I32BE "a";
H5T_IEEE_F32BE "b";
H5T_IEEE_F32BE "c";
}
}
}
}

18
tools/testfiles/topaque.ddl
View File

@ -1,18 +0,0 @@
#############################
Expected output for 'h5dump topaque.h5'
#############################
HDF5 "topaque.h5" {
GROUP "/" {
DATASET "opaque test" {
DATATYPE {
H5T_OPAQUE;
OPAQUE_TAG "test opaque type";
}
DATASPACE { SIMPLE ( 2 ) / ( 2 ) }
DATA {
0x0063016202610360045f055e065d075c085b095a0a590b580c570d560e550f541053115212511350144f154e164d174c184b194a1a491b481c471d461e451f442043214222412340243f253e263d273c283b293a2a392b382c372d362e352f343033313232313330342f352e362d372c382b392a3a293b283c273d263e253f244023412242214320441f451e461d471c481b491a4a194b184c174d164e154f145013511252115310540f550e560d570c580b590a5a095b085c075d065e055f046003610262016300,
0x3800002c3c000027340001ea04000012000000000008a4640000000000000000000000000000000000000000ef7ec9c000000001effffa84effffa8c0003fc000000000000000000effffa2000012e84effffa2000012e5800000003effffa8400000004effffa8c00000005effffaf0000000000000000000000001effffa84effffa8c0003fc0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
}
}
}
}

21
tools/testfiles/tordergr1.ddl Normal file
View File

@ -0,0 +1,21 @@
#############################
Expected output for 'h5dump --group=1 --sort_by=creation_order --sort_order=ascending tordergr.h5'
#############################
HDF5 "tordergr.h5" {
GROUP "1" {
GROUP "c" {
}
GROUP "b" {
}
GROUP "a" {
GROUP "a1" {
}
GROUP "a2" {
GROUP "a22" {
}
GROUP "a21" {
}
}
}
}
}

21
tools/testfiles/tordergr2.ddl Normal file
View File

@ -0,0 +1,21 @@
#############################
Expected output for 'h5dump --group=1 --sort_by=creation_order --sort_order=descending tordergr.h5'
#############################
HDF5 "tordergr.h5" {
GROUP "1" {
GROUP "a" {
GROUP "a2" {
GROUP "a21" {
}
GROUP "a22" {
}
}
GROUP "a1" {
}
}
GROUP "b" {
}
GROUP "c" {
}
}
}

21
tools/testfiles/tordergr3.ddl Normal file
View File

@ -0,0 +1,21 @@
#############################
Expected output for 'h5dump -g 2 -q name -z ascending tordergr.h5'
#############################
HDF5 "tordergr.h5" {
GROUP "2" {
GROUP "a" {
GROUP "a1" {
}
GROUP "a2" {
GROUP "a21" {
}
GROUP "a22" {
}
}
}
GROUP "b" {
}
GROUP "c" {
}
}
}

21
tools/testfiles/tordergr4.ddl Normal file
View File

@ -0,0 +1,21 @@
#############################
Expected output for 'h5dump -g 2 -q name -z descending tordergr.h5'
#############################
HDF5 "tordergr.h5" {
GROUP "2" {
GROUP "c" {
}
GROUP "b" {
}
GROUP "a" {
GROUP "a2" {
GROUP "a22" {
}
GROUP "a21" {
}
}
GROUP "a1" {
}
}
}
}

39
tools/testfiles/tordergr5.ddl Normal file
View File

@ -0,0 +1,39 @@
#############################
Expected output for 'h5dump -q creation_order tordergr.h5'
#############################
HDF5 "tordergr.h5" {
GROUP "/" {
GROUP "2" {
GROUP "a" {
GROUP "a1" {
}
GROUP "a2" {
GROUP "a21" {
}
GROUP "a22" {
}
}
}
GROUP "b" {
}
GROUP "c" {
}
}
GROUP "1" {
GROUP "c" {
}
GROUP "b" {
}
GROUP "a" {
GROUP "a1" {
}
GROUP "a2" {
GROUP "a22" {
}
GROUP "a21" {
}
}
}
}
}
}

32
tools/testfiles/tregref.ddl
View File

@ -1,32 +0,0 @@
#############################
Expected output for 'h5dump tdatareg.h5'
#############################
HDF5 "tdatareg.h5" {
GROUP "/" {
DATASET "Dataset1" {
DATATYPE H5T_REFERENCE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): DATASET /Dataset2 {(2,2)-(7,7)}, DATASET /Dataset2 {(6,9), (2,2),
(1): (8,4), (1,6), (2,8), (3,2), (0,4), (9,0), (7,1), (3,3)}, NULL,
(3): NULL
}
}
DATASET "Dataset2" {
DATATYPE H5T_STD_U8BE
DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
DATA {
(0,0): 0, 3, 6, 9, 12, 15, 18, 21, 24, 27,
(1,0): 30, 33, 36, 39, 42, 45, 48, 51, 54, 57,
(2,0): 60, 63, 66, 69, 72, 75, 78, 81, 84, 87,
(3,0): 90, 93, 96, 99, 102, 105, 108, 111, 114, 117,
(4,0): 120, 123, 126, 129, 132, 135, 138, 141, 144, 147,
(5,0): 150, 153, 156, 159, 162, 165, 168, 171, 174, 177,
(6,0): 180, 183, 186, 189, 192, 195, 198, 201, 204, 207,
(7,0): 210, 213, 216, 219, 222, 225, 228, 231, 234, 237,
(8,0): 240, 243, 246, 249, 252, 255, 2, 5, 8, 11,
(9,0): 14, 17, 20, 23, 26, 29, 32, 35, 38, 41
}
}
}
}