[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, 12 insertions, 5 deletions

diff --git a/tools/testfiles/tfpformat.ddl b/tools/testfiles/tfpformat.ddl
index 2336822..2830ad5 100644
--- a/tools/testfiles/tfpformat.ddl
+++ b/tools/testfiles/tfpformat.ddl
@@ -1,20 +1,27 @@
-#############################
-Expected output for 'h5dump -m %.7f tfpformat.h5'
-#############################
 HDF5 "tfpformat.h5" {
 GROUP "/" {
    DATASET "double" {
       DATATYPE  H5T_IEEE_F64LE
       DATASPACE  SIMPLE { ( 6 ) / ( 6 ) }
       DATA {
-      (0): -0.1234567, 0.1234567, 0.0000000, 0.0000000, 0.0000000, 0.0000000
+      (0): -0.1234567,
+      (1): 0.1234567,
+      (2): 0.0000000,
+      (3): 0.0000000,
+      (4): 0.0000000,
+      (5): 0.0000000
       }
    }
    DATASET "float" {
       DATATYPE  H5T_IEEE_F32LE
       DATASPACE  SIMPLE { ( 6 ) / ( 6 ) }
       DATA {
-      (0): -0.1234567, 0.1234567, 0.0000000, 0.0000000, 0.0000000, 0.0000000
+      (0): -0.1234567,
+      (1): 0.1234567,
+      (2): 0.0000000,
+      (3): 0.0000000,
+      (4): 0.0000000,
+      (5): 0.0000000
       }
    }
 }