[svn-r14412] more progress on the block hyperslab bug, clean code

modified the 3D test case for subsetting with block and stride factors

tested: windows, linux

1 files changed, 9 insertions, 17 deletions

diff --git a/tools/testfiles/tindicessub3.ddl b/tools/testfiles/tindicessub3.ddl
index ba86242..222e552 100644
--- a/tools/testfiles/tindicessub3.ddl
+++ b/tools/testfiles/tindicessub3.ddl
@@ -1,28 +1,20 @@
 #############################
-Expected output for 'h5dump -d 3d -s 0,1,3 -c 2,6,4 taindices.h5'
+Expected output for 'h5dump -d 3d -s 0,1,2 -c 1,2,3 -k 1,2,1 -S 1,2,1 taindices.h5'
 #############################
 HDF5 "taindices.h5" {
 DATASET "3d" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 2, 10, 10 ) / ( 2, 10, 10 ) }
    SUBSET {
-      START ( 0, 1, 3 );
-      STRIDE ( 1, 1, 1 );
-      COUNT ( 2, 6, 4 );
-      BLOCK ( 1, 1, 1 );
+      START ( 0, 1, 2 );
+      STRIDE ( 1, 2, 1 );
+      COUNT ( 1, 2, 3 );
+      BLOCK ( 1, 2, 1 );
       DATA {
-      (0,1,3): 13, 14, 15, 16,
-      (0,2,3):  23, 24, 25, 26,
-      (0,3,3):  33, 34, 35, 36,
-      (0,4,3):  43, 44, 45, 46,
-      (0,5,3):  53, 54, 55, 56,
-      (0,6,3):  63, 64, 65, 66
-      (1,1,3):  113, 114, 115, 116,
-      (1,2,3):  123, 124, 125, 126,
-      (1,3,3):  133, 134, 135, 136,
-      (1,4,3):  143, 144, 145, 146,
-      (1,5,3):  153, 154, 155, 156,
-      (1,6,3):  163, 164, 165, 166
+      (0,1,2): 12, 13, 14,
+      (0,3,2):  32, 33, 34,
+      (0,5,2):  52, 53, 54,
+      (0,7,2):  72, 73, 74
       }
    }
 }