[svn-r15221] Description:

	Bring changes from trunk from the time the branch was created (r14280)
up to the 1.8.0 release (r14525) back into the metadata journaling branch.

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode

1 files changed, 6 insertions, 8 deletions

diff --git a/tools/testfiles/tindicessub1.ddl b/tools/testfiles/tindicessub1.ddl
index 6195a78..0173fb5 100644
--- a/tools/testfiles/tindicessub1.ddl
+++ b/tools/testfiles/tindicessub1.ddl
@@ -1,19 +1,17 @@
 #############################
-Expected output for 'h5dump -d 1d -s 3 -c 40 taindices.h5'
+Expected output for 'h5dump -d 1d -s 1 -S 10 -c 2 -k 3 taindices.h5'
 #############################
 HDF5 "taindices.h5" {
 DATASET "1d" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 100 ) / ( 100 ) }
    SUBSET {
-      START ( 3 );
-      STRIDE ( 1 );
-      COUNT ( 40 );
-      BLOCK ( 1 );
+      START ( 1 );
+      STRIDE ( 10 );
+      COUNT ( 2 );
+      BLOCK ( 3 );
       DATA {
-      (3): 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-      (21): 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
-      (37): 37, 38, 39, 40, 41, 42
+      (1): 1, 2, 3, 11, 12, 13
       }
    }
 }