From f695491f05ebc6306fc873501174c71e8751a6ce Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 21 Aug 2017 10:35:49 -0500
Subject: HDFFV-10188 enable null space test

---
 tools/test/h5dump/CMakeTestsXML.cmake |  8 ++++---
 tools/test/h5dump/testh5dumpxml.sh.in |  4 +---
 tools/testfiles/tnullspace.h5.xml     | 39 +++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 tools/testfiles/tnullspace.h5.xml

diff --git a/tools/test/h5dump/CMakeTestsXML.cmake b/tools/test/h5dump/CMakeTestsXML.cmake
index bdc6755..e068c5e 100644
--- a/tools/test/h5dump/CMakeTestsXML.cmake
+++ b/tools/test/h5dump/CMakeTestsXML.cmake
@@ -53,6 +53,7 @@
       ${HDF5_TOOLS_DIR}/testfiles/test35.nc
       ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5
       ${HDF5_TOOLS_DIR}/testfiles/tnodata.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5
       ${HDF5_TOOLS_DIR}/testfiles/tobjref.h5
       ${HDF5_TOOLS_DIR}/testfiles/topaque.h5
       ${HDF5_TOOLS_DIR}/testfiles/torderattr.h5
@@ -117,6 +118,7 @@
       ${HDF5_TOOLS_DIR}/testfiles/tname-sp.h5.xml
       ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5.xml
       ${HDF5_TOOLS_DIR}/testfiles/tnodata.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5.xml
       ${HDF5_TOOLS_DIR}/testfiles/tobjref.h5.xml
       ${HDF5_TOOLS_DIR}/testfiles/topaque.h5.xml
       ${HDF5_TOOLS_DIR}/testfiles/torderattr1.h5.xml
@@ -296,6 +298,8 @@
           tnodata.h5.out.err
           tnoname.h5.out
           tnoname.h5.out.err
+          tnullspace.h5.out
+          tnullspace.h5.out.err
           tobjref.h5.out
           tobjref.h5.out.err
           topaque.h5.out
@@ -402,9 +406,7 @@
   ADD_XML_H5_TEST (tsaf.h5 0 tsaf.h5)
   ADD_XML_H5_TEST (tempty.h5 0 tempty.h5)
   ADD_XML_H5_TEST (tnamed_dtype_attr.h5 0 tnamed_dtype_attr.h5)
-  ##Test dataset and attribute of null space.  Commented out:
-  ## wait until the XML schema is updated for null space.
-  ##  ADD_XML_H5_TEST (tnullspace.h5 0 tnulspace.h5)
+  ADD_XML_H5_TEST (tnullspace.h5 0 tnullspace.h5)
   ## So is dataspace with 0 dimension size.
   ##  ADD_XML_H5_TEST (zerodim.h5 0 zerodim.h5)
 
diff --git a/tools/test/h5dump/testh5dumpxml.sh.in b/tools/test/h5dump/testh5dumpxml.sh.in
index b3b9e14..f740a34 100644
--- a/tools/test/h5dump/testh5dumpxml.sh.in
+++ b/tools/test/h5dump/testh5dumpxml.sh.in
@@ -355,9 +355,7 @@ TOOLTEST tvlstr.h5.xml --xml tvlstr.h5
 TOOLTEST tsaf.h5.xml --xml tsaf.h5
 TOOLTEST tempty.h5.xml --xml tempty.h5
 TOOLTEST tnamed_dtype_attr.h5.xml --xml tnamed_dtype_attr.h5
-##Test dataset and attribute of null space.  Commented out:
-## wait until the XML schema is updated for null space.
-##TOOLTEST tnullspace.h5.xml --xml tnulspace.h5
+TOOLTEST tnullspace.h5.xml --xml tnullspace.h5
 
 # other options for xml
 
diff --git a/tools/testfiles/tnullspace.h5.xml b/tools/testfiles/tnullspace.h5.xml
new file mode 100644
index 0000000..b1c1974
--- /dev/null
+++ b/tools/testfiles/tnullspace.h5.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" 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_928" H5Path="/">
+   <hdf5:Attribute Name="attr">
+      <hdf5:Dataspace>
+         <!-- unknown dataspace -->
+      </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:Dataset Name="dset" OBJ-XID="xid_976" H5Path= "/dset" 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>
+         <!-- unknown dataspace -->
+      </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>
-- 
cgit v0.12