[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, 49 insertions, 108 deletions

diff --git a/tools/testfiles/tcompound.h5.xml b/tools/testfiles/tcompound.h5.xml
index ed255e7..10ef36e 100644
--- a/tools/testfiles/tcompound.h5.xml
+++ b/tools/testfiles/tcompound.h5.xml
@@ -1,8 +1,5 @@
-#############################
-Expected output for 'h5dump --xml tcompound.h5'
-#############################
 <?xml version="1.0" encoding="UTF-8"?>
-<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd">
+<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
    <hdf5:NamedDataType Name="#6632" OBJ-XID="xid_18446744073709551614" Parents="xid_696" H5ParentPaths="/">
       <hdf5:DataType>
@@ -28,9 +25,9 @@ Expected output for 'h5dump --xml tcompound.h5'
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
-         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+      <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
          <hdf5:FillValue>
-               <hdf5:NoFill/>
+            <hdf5:NoFill/>
          </hdf5:FillValue>
       </hdf5:FillValueInfo>
       <hdf5:Dataspace>
@@ -66,7 +63,11 @@ Expected output for 'h5dump --xml tcompound.h5'
    <!-- Note: format of compound data not specified -->
       <hdf5:Data>
          <hdf5:DataFromFile>
-         0 0 1 1 1 0.5 2 4 0.333333 3 9 0.25 4 16 0.2
+         0 0 1
+         1 1 0.5
+         2 4 0.333333
+         3 9 0.25
+         4 16 0.2
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
@@ -75,9 +76,9 @@ Expected output for 'h5dump --xml tcompound.h5'
          <hdf5:StorageLayout>
             <hdf5:ContiguousLayout/>
          </hdf5:StorageLayout>
-               <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
             <hdf5:FillValue>
-                  <hdf5:NoFill/>
+               <hdf5:NoFill/>
             </hdf5:FillValue>
          </hdf5:FillValueInfo>
          <hdf5:Dataspace>
@@ -89,7 +90,11 @@ Expected output for 'h5dump --xml tcompound.h5'
       <!-- Note: format of compound data not specified -->
          <hdf5:Data>
             <hdf5:DataFromFile>
-            0 0 1 1.1 2 2.2 3 3.3 4 4.4
+            0 0
+            1 1.1
+            2 2.2
+            3 3.3
+            4 4.4
             </hdf5:DataFromFile>
          </hdf5:Data>
       </hdf5:Dataset>
@@ -97,9 +102,9 @@ Expected output for 'h5dump --xml tcompound.h5'
          <hdf5:StorageLayout>
             <hdf5:ContiguousLayout/>
          </hdf5:StorageLayout>
-               <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
             <hdf5:FillValue>
-                  <hdf5:NoFill/>
+               <hdf5:NoFill/>
             </hdf5:FillValue>
          </hdf5:FillValueInfo>
          <hdf5:Dataspace>
@@ -112,96 +117,24 @@ Expected output for 'h5dump --xml tcompound.h5'
       <!-- Note: format of compound data not specified -->
          <hdf5:Data>
             <hdf5:DataFromFile>
-             0 1 2 3  1 2 3 4 5 6
-                  2 3 4 5 6 7
-                  3 4 5 6 7 8
-                  4 5 6 7 8 9
-                  5 6 7 8 9 10
-             1 2 3 4  2 3 4 5 6 7
-                  3 4 5 6 7 8
-                  4 5 6 7 8 9
-                  5 6 7 8 9 10
-                  6 7 8 9 10 11
-             2 3 4 5  3 4 5 6 7 8
-                  4 5 6 7 8 9
-                  5 6 7 8 9 10
-                  6 7 8 9 10 11
-                  7 8 9 10 11 12
-             3 4 5 6  4 5 6 7 8 9
-                  5 6 7 8 9 10
-                  6 7 8 9 10 11
-                  7 8 9 10 11 12
-                  8 9 10 11 12 13
-             4 5 6 7  5 6 7 8 9 10
-                  6 7 8 9 10 11
-                  7 8 9 10 11 12
-                  8 9 10 11 12 13
-                  9 10 11 12 13 14
-             5 6 7 8  6 7 8 9 10 11
-                  7 8 9 10 11 12
-                  8 9 10 11 12 13
-                  9 10 11 12 13 14
-                  10 11 12 13 14 15
-             1 2 3 4  2 3 4 5 6 7
-                  3 4 5 6 7 8
-                  4 5 6 7 8 9
-                  5 6 7 8 9 10
-                  6 7 8 9 10 11
-             2 3 4 5  3 4 5 6 7 8
-                  4 5 6 7 8 9
-                  5 6 7 8 9 10
-                  6 7 8 9 10 11
-                  7 8 9 10 11 12
-             3 4 5 6  4 5 6 7 8 9
-                  5 6 7 8 9 10
-                  6 7 8 9 10 11
-                  7 8 9 10 11 12
-                  8 9 10 11 12 13
-             4 5 6 7  5 6 7 8 9 10
-                  6 7 8 9 10 11
-                  7 8 9 10 11 12
-                  8 9 10 11 12 13
-                  9 10 11 12 13 14
-             5 6 7 8  6 7 8 9 10 11
-                  7 8 9 10 11 12
-                  8 9 10 11 12 13
-                  9 10 11 12 13 14
-                  10 11 12 13 14 15
-             6 7 8 9  7 8 9 10 11 12
-                  8 9 10 11 12 13
-                  9 10 11 12 13 14
-                  10 11 12 13 14 15
-                  11 12 13 14 15 16
-             2 3 4 5  3 4 5 6 7 8
-                  4 5 6 7 8 9
-                  5 6 7 8 9 10
-                  6 7 8 9 10 11
-                  7 8 9 10 11 12
-             3 4 5 6  4 5 6 7 8 9
-                  5 6 7 8 9 10
-                  6 7 8 9 10 11
-                  7 8 9 10 11 12
-                  8 9 10 11 12 13
-             4 5 6 7  5 6 7 8 9 10
-                  6 7 8 9 10 11
-                  7 8 9 10 11 12
-                  8 9 10 11 12 13
-                  9 10 11 12 13 14
-             5 6 7 8  6 7 8 9 10 11
-                  7 8 9 10 11 12
-                  8 9 10 11 12 13
-                  9 10 11 12 13 14
-                  10 11 12 13 14 15
-             6 7 8 9  7 8 9 10 11 12
-                  8 9 10 11 12 13
-                  9 10 11 12 13 14
-                  10 11 12 13 14 15
-                  11 12 13 14 15 16
-             7 8 9 10  8 9 10 11 12 13
-                  9 10 11 12 13 14
-                  10 11 12 13 14 15
-                  11 12 13 14 15 16
-                  12 13 14 15 16 17
+            0 1 2 3 1 2 3 4 5 6 2 3 4 5 6 7 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10
+            1 2 3 4 2 3 4 5 6 7 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11
+            2 3 4 5 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12
+            3 4 5 6 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13
+            4 5 6 7 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14
+            5 6 7 8 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14 10 11 12 13 14 15
+            1 2 3 4 2 3 4 5 6 7 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11
+            2 3 4 5 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12
+            3 4 5 6 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13
+            4 5 6 7 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14
+            5 6 7 8 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14 10 11 12 13 14 15
+            6 7 8 9 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14 10 11 12 13 14 15 11 12 13 14 15 16
+            2 3 4 5 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12
+            3 4 5 6 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13
+            4 5 6 7 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14
+            5 6 7 8 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14 10 11 12 13 14 15
+            6 7 8 9 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14 10 11 12 13 14 15 11 12 13 14 15 16
+            7 8 9 10 8 9 10 11 12 13 9 10 11 12 13 14 10 11 12 13 14 15 11 12 13 14 15 16 12 13 14 15 16 17
             </hdf5:DataFromFile>
          </hdf5:Data>
       </hdf5:Dataset>
@@ -209,9 +142,9 @@ Expected output for 'h5dump --xml tcompound.h5'
          <hdf5:StorageLayout>
             <hdf5:ContiguousLayout/>
          </hdf5:StorageLayout>
-               <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
             <hdf5:FillValue>
-                  <hdf5:NoFill/>
+               <hdf5:NoFill/>
             </hdf5:FillValue>
          </hdf5:FillValueInfo>
          <hdf5:Dataspace>
@@ -223,7 +156,11 @@ Expected output for 'h5dump --xml tcompound.h5'
       <!-- Note: format of compound data not specified -->
          <hdf5:Data>
             <hdf5:DataFromFile>
-            0 3 1 4 2 5 3 6 4 7
+            0 3
+            1 4
+            2 5
+            3 6
+            4 7
             </hdf5:DataFromFile>
          </hdf5:Data>
       </hdf5:Dataset>
@@ -253,9 +190,9 @@ Expected output for 'h5dump --xml tcompound.h5'
          <hdf5:StorageLayout>
             <hdf5:ContiguousLayout/>
          </hdf5:StorageLayout>
-               <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
             <hdf5:FillValue>
-                  <hdf5:NoFill/>
+               <hdf5:NoFill/>
             </hdf5:FillValue>
          </hdf5:FillValueInfo>
          <hdf5:Dataspace>
@@ -267,7 +204,11 @@ Expected output for 'h5dump --xml tcompound.h5'
       <!-- Note: format of compound data not specified -->
          <hdf5:Data>
             <hdf5:DataFromFile>
-            0 0 1 0.1 2 0.2 3 0.3 4 0.4
+            0 0
+            1 0.1
+            2 0.2
+            3 0.3
+            4 0.4
             </hdf5:DataFromFile>
          </hdf5:Data>
       </hdf5:Dataset>