[svn-r22105] Description:

	Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously.  The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.

Tested on:
	Mac OSX/64 10.7.3 (amazon) w/debug

1 files changed, 7 insertions, 10 deletions

diff --git a/tools/testfiles/tattr-2.ddl b/tools/testfiles/tattr-2.ddl
index 195b9ab..328b54f 100644
--- a/tools/testfiles/tattr-2.ddl
+++ b/tools/testfiles/tattr-2.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5dump -a /attr1 --attribute /attr4 --attribute=/attr5 tattr.h5'
-#############################
 HDF5 "tattr.h5" {
 ATTRIBUTE "/attr1" {
    DATATYPE  H5T_STD_I8BE
@@ -10,20 +7,20 @@ ATTRIBUTE "/attr1" {
    (14): 111, 111, 116, 32, 103, 114, 111, 117, 112, 0
    }
 }
-ATTRIBUTE "/attr4" {
+ATTRIBUTE "attr4" {
    DATATYPE  H5T_STD_I32BE
    DATASPACE  SCALAR
    DATA {
    (0): 100
    }
 }
-ATTRIBUTE "/attr5" {
+ATTRIBUTE "attr5" {
    DATATYPE  H5T_STRING {
-         STRSIZE 17;
-         STRPAD H5T_STR_NULLTERM;
-         CSET H5T_CSET_ASCII;
-         CTYPE H5T_C_S1;
-      }
+      STRSIZE 17;
+      STRPAD H5T_STR_NULLTERM;
+      CSET H5T_CSET_ASCII;
+      CTYPE H5T_C_S1;
+   }
    DATASPACE  SCALAR
    DATA {
    (0): "string attribute"