summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2008-01-14 21:29:09 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2008-01-14 21:29:09 (GMT)
commit1c3e5859d1cdc0e26f21fbc2249577123ad5b8d1 (patch)
tree3f02bb5e5586e96cfc1be328466ae4767647b62e /tools
parent4c2256e94691bc3e15c1f053b069f3ce0495a435 (diff)
downloadhdf5-1c3e5859d1cdc0e26f21fbc2249577123ad5b8d1.zip
hdf5-1c3e5859d1cdc0e26f21fbc2249577123ad5b8d1.tar.gz
hdf5-1c3e5859d1cdc0e26f21fbc2249577123ad5b8d1.tar.bz2
[svn-r14411] more progress on the block hyperslab bug, clean code
modified the 2D test case for subsetting with block and stride factors tested: windows, linux
Diffstat (limited to 'tools')
-rw-r--r--tools/h5dump/testh5dump.sh.in2
-rw-r--r--tools/testfiles/tindicessub2.ddl20
2 files changed, 10 insertions, 12 deletions
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index a976a68..d6877ac 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -378,7 +378,7 @@ TOOLTEST tindicesno.ddl -y taindices.h5
TOOLTEST tindicessub1.ddl -d 1d -s 1 -c 2 -k 3 -S 10 taindices.h5
# 2D case
-TOOLTEST tindicessub2.ddl -d 2d -s 1,3 -c 6,4 taindices.h5
+TOOLTEST tindicessub2.ddl -d 2d -s 1,2 -c 2,3 -k 2,2 -S 2,1 taindices.h5
# 3D case
TOOLTEST tindicessub3.ddl -d 3d -s 0,1,3 -c 2,6,4 taindices.h5
diff --git a/tools/testfiles/tindicessub2.ddl b/tools/testfiles/tindicessub2.ddl
index 9fc987c..2cb8912 100644
--- a/tools/testfiles/tindicessub2.ddl
+++ b/tools/testfiles/tindicessub2.ddl
@@ -1,22 +1,20 @@
#############################
-Expected output for 'h5dump -d 2d -s 1,3 -c 6,4 taindices.h5'
+Expected output for 'h5dump -d 2d -s 1,2 -c 2,3 -k 2,2 -S 2,1 taindices.h5'
#############################
HDF5 "taindices.h5" {
DATASET "2d" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
SUBSET {
- START ( 1, 3 );
- STRIDE ( 1, 1 );
- COUNT ( 6, 4 );
- BLOCK ( 1, 1 );
+ START ( 1, 2 );
+ STRIDE ( 2, 1 );
+ COUNT ( 2, 3 );
+ BLOCK ( 2, 2 );
DATA {
- (1,3): 13, 14, 15, 16,
- (2,3): 23, 24, 25, 26,
- (3,3): 33, 34, 35, 36,
- (4,3): 43, 44, 45, 46,
- (5,3): 53, 54, 55, 56,
- (6,3): 63, 64, 65, 66
+ (1,2): 12, 13, 14, 15, 16, 17,
+ (3,2): 32, 33, 34, 35, 36, 37,
+ (5,2): 52, 53, 54, 55, 56, 57,
+ (7,2): 72, 73, 74, 75, 76, 77
}
}
}