[svn-r982] Added test for loop detection.

Updated expected output for dumper automatic tests.
Removed redundant tests.

1 files changed, 17 insertions, 11 deletions

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"
       }
    }
 }