[svn-r8714] *** empty log message ***

10 files changed, 20 insertions, 53 deletions

diff --git a/tools/testfiles/tattr-1.ddl b/tools/testfiles/tattr-1.ddl
index ad473af..b5b8afe 100644
--- a/tools/testfiles/tattr-1.ddl
+++ b/tools/testfiles/tattr-1.ddl
@@ -44,11 +44,5 @@ GROUP "/" {
          "string attribute"
       }
    }
-   ATTRIBUTE "attr6" {
-      DATATYPE  H5T_STD_U32LE
-      DATASPACE  NULL
-      DATA {
-      }
-   }
 }
 }
diff --git a/tools/testfiles/tattr.h5 b/tools/testfiles/tattr.h5
index 4314cdf..578a20a 100644
--- a/tools/testfiles/tattr.h5
+++ b/tools/testfiles/tattr.h5
diff --git a/tools/testfiles/tattr.h5.xml b/tools/testfiles/tattr.h5.xml
index 71154f6..eb2941b 100644
--- a/tools/testfiles/tattr.h5.xml
+++ b/tools/testfiles/tattr.h5.xml
@@ -86,18 +86,5 @@ Expected output for 'h5dump --xml tattr.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Attribute>
-   <hdf5:Attribute Name="attr6">
-      <hdf5:Dataspace>
-         <hdf5:NullDataspace />
-      </hdf5:Dataspace>
-      <hdf5:DataType>
-         <hdf5:AtomicType>
-            <hdf5:IntegerType ByteOrder="LE" Sign="false" Size="4" />
-         </hdf5:AtomicType>
-      </hdf5:DataType>
-      <hdf5:Data>
-         <hdf5:NoData/>
-      </hdf5:Data>
-   </hdf5:Attribute>
 </hdf5:RootGroup>
 </hdf5:HDF5-File>
diff --git a/tools/testfiles/tdset-1.ddl b/tools/testfiles/tdset-1.ddl
index 9154436..8843c6e 100644
--- a/tools/testfiles/tdset-1.ddl
+++ b/tools/testfiles/tdset-1.ddl
@@ -125,11 +125,5 @@ GROUP "/" {
         (29,14) 29.0014, 29.0015, 29.0016, 29.0017, 29.0018, 29.0019
       }
    }
-   DATASET "dset3" {
-      DATATYPE  H5T_STD_I32BE
-      DATASPACE  NULL
-      DATA {
-      }
-   }
 }
 }
diff --git a/tools/testfiles/tdset-1.ls b/tools/testfiles/tdset-1.ls
index dad8ef6..6853429 100644
--- a/tools/testfiles/tdset-1.ls
+++ b/tools/testfiles/tdset-1.ls
@@ -99,5 +99,3 @@
         (28,19) 28.0019, 29, 29.0001, 29.0002, 29.0003, 29.0004, 29.0005,
         (29,6) 29.0006, 29.0007, 29.0008, 29.0009, 29.001, 29.0011, 29.0012,
         (29,13) 29.0013, 29.0014, 29.0015, 29.0016, 29.0017, 29.0018, 29.0019
-/dset3                   Dataset {NULL}
-    Data:
diff --git a/tools/testfiles/tdset-2.ddl b/tools/testfiles/tdset-2.ddl
index 3d75089..8bb18f2 100644
--- a/tools/testfiles/tdset-2.ddl
+++ b/tools/testfiles/tdset-2.ddl
@@ -1,5 +1,5 @@
 #############################
-Expected output for 'h5dump -H -d dset1 -d /dset2 --dataset=dset3 tdset.h5'
+Expected output for 'h5dump -H -d dset1 -d /dset2 tdset.h5'
 #############################
 HDF5 "tdset.h5" {
 DATASET "dset1" {
@@ -10,8 +10,4 @@ DATASET "/dset2" {
    DATATYPE  H5T_IEEE_F64BE
    DATASPACE  SIMPLE { ( 30, 20 ) / ( 30, 20 ) }
 }
-DATASET "dset3" {
-   DATATYPE  H5T_STD_I32BE
-   DATASPACE  NULL
-}
 }
diff --git a/tools/testfiles/tdset.h5 b/tools/testfiles/tdset.h5
index c3b7c9c..3cb9a69 100644
--- a/tools/testfiles/tdset.h5
+++ b/tools/testfiles/tdset.h5
diff --git a/tools/testfiles/tdset.h5.xml b/tools/testfiles/tdset.h5.xml
index 9f375a7..85b54b6 100644
--- a/tools/testfiles/tdset.h5.xml
+++ b/tools/testfiles/tdset.h5.xml
@@ -144,26 +144,5 @@ Expected output for 'h5dump --xml tdset.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="dset3" OBJ-XID="xid_8896" H5Path= "/dset3" Parents="xid_928" H5ParentPaths="/">
-      <hdf5:StorageLayout>
-         <hdf5:ContiguousLayout/>
-      </hdf5:StorageLayout>
-         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
-         <hdf5:FillValue>
-               <hdf5:NoFill/>
-         </hdf5:FillValue>
-      </hdf5:FillValueInfo>
-      <hdf5:Dataspace>
-         <hdf5:NullDataspace />
-      </hdf5:Dataspace>
-      <hdf5:DataType>
-         <hdf5:AtomicType>
-            <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
-         </hdf5:AtomicType>
-      </hdf5:DataType>
-      <hdf5:Data>
-         <hdf5:NoData/>
-      </hdf5:Data>
-   </hdf5:Dataset>
 </hdf5:RootGroup>
 </hdf5:HDF5-File>
diff --git a/tools/testfiles/tnullspace.ddl b/tools/testfiles/tnullspace.ddl
new file mode 100644
index 0000000..5507b08
--- /dev/null
+++ b/tools/testfiles/tnullspace.ddl
@@ -0,0 +1,19 @@
+#############################
+Expected output for 'h5dump tnullspace.h5'
+#############################
+HDF5 "tnullspace.h5" {
+GROUP "/" {
+   ATTRIBUTE "attr" {
+      DATATYPE  H5T_STD_U32LE
+      DATASPACE  NULL
+      DATA {
+      }
+   }
+   DATASET "dset" {
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  NULL
+      DATA {
+      }
+   }
+}
+}
diff --git a/tools/testfiles/tnullspace.h5 b/tools/testfiles/tnullspace.h5
new file mode 100644
index 0000000..54242ca
--- /dev/null
+++ b/tools/testfiles/tnullspace.h5