From ec0935a924a84b18b29473b4fcec7c3f4e1aca76 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 10 May 2017 12:45:06 -0500
Subject: HDFFV-10186 xml test also needs endianess aware files

---
 MANIFEST                              |   3 +-
 tools/test/h5dump/CMakeTestsXML.cmake |  15 +++--
 tools/test/h5dump/testh5dumpxml.sh.in |   9 ++-
 tools/testfiles/tbitfields.h5.xml     | 103 ----------------------------------
 tools/testfiles/tbitfields_be.h5.xml  | 103 ++++++++++++++++++++++++++++++++++
 tools/testfiles/tbitfields_le.h5.xml  | 103 ++++++++++++++++++++++++++++++++++
 6 files changed, 226 insertions(+), 110 deletions(-)
 delete mode 100644 tools/testfiles/tbitfields.h5.xml
 create mode 100644 tools/testfiles/tbitfields_be.h5.xml
 create mode 100644 tools/testfiles/tbitfields_le.h5.xml

diff --git a/MANIFEST b/MANIFEST
index 9e7fa72..e448a44 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2080,7 +2080,8 @@
 ./tools/testfiles/tarray6.h5.xml
 ./tools/testfiles/tarray7.h5.xml
 ./tools/testfiles/tattr.h5.xml
-./tools/testfiles/tbitfields.h5.xml
+./tools/testfiles/tbitfields_be.h5.xml
+./tools/testfiles/tbitfields_le.h5.xml
 ./tools/testfiles/tcompound.h5.xml
 ./tools/testfiles/tcompound2.h5.xml
 ./tools/testfiles/tcompound_complex.h5.xml
diff --git a/tools/test/h5dump/CMakeTestsXML.cmake b/tools/test/h5dump/CMakeTestsXML.cmake
index c353e48..92e08a0 100644
--- a/tools/test/h5dump/CMakeTestsXML.cmake
+++ b/tools/test/h5dump/CMakeTestsXML.cmake
@@ -81,7 +81,8 @@
       ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5.xml
       ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5.xml
       ${HDF5_TOOLS_DIR}/testfiles/tattr.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tbitfields.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tbitfields_be.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tbitfields_le.h5.xml
       ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5.xml
       ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5.xml
       ${HDF5_TOOLS_DIR}/testfiles/tcompound2.h5.xml
@@ -221,8 +222,10 @@
           tarray7.h5.out.err
           tattr.h5.out
           tattr.h5.out.err
-          tbitfields.h5.out
-          tbitfields.h5.out.err
+          tbitfields_be.h5.out
+          tbitfields_be.h5.out.err
+          tbitfields_le.h5.out
+          tbitfields_le.h5.out.err
           tcompound.h5.out
           tcompound.h5.out.err
           tcompound2.h5.out
@@ -344,7 +347,11 @@
   ########## test XML
   ADD_XML_H5_TEST (tall.h5 0 tall.h5)
   ADD_XML_H5_TEST (tattr.h5 0 tattr.h5)
-  ADD_XML_H5_TEST (tbitfields.h5 0 tbitfields.h5)
+  if (H5_WORDS_BIGENDIAN)
+    ADD_XML_H5_TEST (tbitfields_be.h5 0 tbitfields.h5)
+  else ()
+    ADD_XML_H5_TEST (tbitfields_le.h5 0 tbitfields.h5)
+  endif ()
   ADD_XML_H5_TEST (tcompound.h5 0 tcompound.h5)
   ADD_XML_H5_TEST (tcompound2.h5 0 tcompound2.h5)
   ADD_XML_H5_TEST (tdatareg.h5 0 tdatareg.h5)
diff --git a/tools/test/h5dump/testh5dumpxml.sh.in b/tools/test/h5dump/testh5dumpxml.sh.in
index a33f5bc..d0fad63 100644
--- a/tools/test/h5dump/testh5dumpxml.sh.in
+++ b/tools/test/h5dump/testh5dumpxml.sh.in
@@ -124,7 +124,8 @@ $SRC_H5DUMP_TESTFILES/tarray3.h5.xml
 $SRC_H5DUMP_TESTFILES/tarray6.h5.xml
 $SRC_H5DUMP_TESTFILES/tarray7.h5.xml
 $SRC_H5DUMP_TESTFILES/tattr.h5.xml
-$SRC_H5DUMP_TESTFILES/tbitfields.h5.xml
+$SRC_H5DUMP_TESTFILES/tbitfields_be.h5.xml
+$SRC_H5DUMP_TESTFILES/tbitfields_le.h5.xml
 $SRC_H5DUMP_TESTFILES/tcompound_complex.h5.xml
 $SRC_H5DUMP_TESTFILES/tcompound.h5.xml
 $SRC_H5DUMP_TESTFILES/tcompound2.h5.xml
@@ -299,7 +300,11 @@ COPY_TESTFILES_TO_TESTDIR
 # test XML
 TOOLTEST tall.h5.xml --xml tall.h5
 TOOLTEST tattr.h5.xml --xml tattr.h5
-TOOLTEST tbitfields.h5.xml --xml tbitfields.h5
+if test $WORDS_BIGENDIAN != "yes"; then
+TOOLTEST tbitfields_le.h5.xml --xml tbitfields.h5
+else
+TOOLTEST tbitfields_be.h5.xml --xml tbitfields.h5
+fi
 TOOLTEST tcompound.h5.xml --xml tcompound.h5
 TOOLTEST tcompound2.h5.xml --xml tcompound2.h5
 TOOLTEST tdatareg.h5.xml --xml tdatareg.h5
diff --git a/tools/testfiles/tbitfields.h5.xml b/tools/testfiles/tbitfields.h5.xml
deleted file mode 100644
index c8ba026..0000000
--- a/tools/testfiles/tbitfields.h5.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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_696" H5Path="/">
-   <hdf5:Group Name="typetests" OBJ-XID="xid_1344" H5Path="/typetests" Parents="xid_696" H5ParentPaths="/" >
-      <hdf5:Dataset Name="bitfield_1" OBJ-XID="xid_1720" H5Path= "/typetests/bitfield_1" Parents="xid_1344" H5ParentPaths="/typetests">
-         <hdf5:StorageLayout>
-            <hdf5:ContiguousLayout/>
-         </hdf5:StorageLayout>
-         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
-            <hdf5:FillValue>
-               <hdf5:NoFill/>
-            </hdf5:FillValue>
-         </hdf5:FillValueInfo>
-         <hdf5:Dataspace>
-            <hdf5:SimpleDataspace Ndims="1">
-               <hdf5:Dimension  DimSize="32" MaxDimSize="32"/>
-            </hdf5:SimpleDataspace>
-         </hdf5:Dataspace>
-         <hdf5:DataType>
-            <hdf5:AtomicType>
-               <hdf5:BitfieldType ByteOrder="LE" Size="1"/>
-            </hdf5:AtomicType>
-         </hdf5:DataType>
-         <hdf5:Data>
-            <hdf5:DataFromFile>
-            0xff
-            0xfe
-            0xfd
-            0xfc
-            0xfb
-            0xfa
-            0xf9
-            0xf8
-            0xf7
-            0xf6
-            0xf5
-            0xf4
-            0xf3
-            0xf2
-            0xf1
-            0xf0
-            0xef
-            0xee
-            0xed
-            0xec
-            0xeb
-            0xea
-            0xe9
-            0xe8
-            0xe7
-            0xe6
-            0xe5
-            0xe4
-            0xe3
-            0xe2
-            0xe1
-            0xe0
-            </hdf5:DataFromFile>
-         </hdf5:Data>
-      </hdf5:Dataset>
-      <hdf5:Dataset Name="bitfield_2" OBJ-XID="xid_2352" H5Path= "/typetests/bitfield_2" Parents="xid_1344" H5ParentPaths="/typetests">
-         <hdf5:StorageLayout>
-            <hdf5:ContiguousLayout/>
-         </hdf5:StorageLayout>
-         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
-            <hdf5:FillValue>
-               <hdf5:NoFill/>
-            </hdf5:FillValue>
-         </hdf5:FillValueInfo>
-         <hdf5:Dataspace>
-            <hdf5:SimpleDataspace Ndims="1">
-               <hdf5:Dimension  DimSize="16" MaxDimSize="16"/>
-            </hdf5:SimpleDataspace>
-         </hdf5:Dataspace>
-         <hdf5:DataType>
-            <hdf5:AtomicType>
-               <hdf5:BitfieldType ByteOrder="LE" Size="2"/>
-            </hdf5:AtomicType>
-         </hdf5:DataType>
-         <hdf5:Data>
-            <hdf5:DataFromFile>
-            ff:fe
-            fd:fc
-            fb:fa
-            f9:f8
-            f7:f6
-            f5:f4
-            f3:f2
-            f1:f0
-            ef:ee
-            ed:ec
-            eb:ea
-            e9:e8
-            e7:e6
-            e5:e4
-            e3:e2
-            e1:e0
-            </hdf5:DataFromFile>
-         </hdf5:Data>
-      </hdf5:Dataset>
-   </hdf5:Group>
-</hdf5:RootGroup>
-</hdf5:HDF5-File>
diff --git a/tools/testfiles/tbitfields_be.h5.xml b/tools/testfiles/tbitfields_be.h5.xml
new file mode 100644
index 0000000..26bbd91
--- /dev/null
+++ b/tools/testfiles/tbitfields_be.h5.xml
@@ -0,0 +1,103 @@
+<?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_696" H5Path="/">
+   <hdf5:Group Name="typetests" OBJ-XID="xid_1344" H5Path="/typetests" Parents="xid_696" H5ParentPaths="/" >
+      <hdf5:Dataset Name="bitfield_1" OBJ-XID="xid_1720" H5Path= "/typetests/bitfield_1" Parents="xid_1344" H5ParentPaths="/typetests">
+         <hdf5:StorageLayout>
+            <hdf5:ContiguousLayout/>
+         </hdf5:StorageLayout>
+         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+            <hdf5:FillValue>
+               <hdf5:NoFill/>
+            </hdf5:FillValue>
+         </hdf5:FillValueInfo>
+         <hdf5:Dataspace>
+            <hdf5:SimpleDataspace Ndims="1">
+               <hdf5:Dimension  DimSize="32" MaxDimSize="32"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <hdf5:DataType>
+            <hdf5:AtomicType>
+               <hdf5:BitfieldType ByteOrder="LE" Size="1"/>
+            </hdf5:AtomicType>
+         </hdf5:DataType>
+         <hdf5:Data>
+            <hdf5:DataFromFile>
+            0xff
+            0xfe
+            0xfd
+            0xfc
+            0xfb
+            0xfa
+            0xf9
+            0xf8
+            0xf7
+            0xf6
+            0xf5
+            0xf4
+            0xf3
+            0xf2
+            0xf1
+            0xf0
+            0xef
+            0xee
+            0xed
+            0xec
+            0xeb
+            0xea
+            0xe9
+            0xe8
+            0xe7
+            0xe6
+            0xe5
+            0xe4
+            0xe3
+            0xe2
+            0xe1
+            0xe0
+            </hdf5:DataFromFile>
+         </hdf5:Data>
+      </hdf5:Dataset>
+      <hdf5:Dataset Name="bitfield_2" OBJ-XID="xid_2352" H5Path= "/typetests/bitfield_2" Parents="xid_1344" H5ParentPaths="/typetests">
+         <hdf5:StorageLayout>
+            <hdf5:ContiguousLayout/>
+         </hdf5:StorageLayout>
+         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+            <hdf5:FillValue>
+               <hdf5:NoFill/>
+            </hdf5:FillValue>
+         </hdf5:FillValueInfo>
+         <hdf5:Dataspace>
+            <hdf5:SimpleDataspace Ndims="1">
+               <hdf5:Dimension  DimSize="16" MaxDimSize="16"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <hdf5:DataType>
+            <hdf5:AtomicType>
+               <hdf5:BitfieldType ByteOrder="LE" Size="2"/>
+            </hdf5:AtomicType>
+         </hdf5:DataType>
+         <hdf5:Data>
+            <hdf5:DataFromFile>
+            fe:ff
+            fc:fd
+            fa:fb
+            f8:f9
+            f6:f7
+            f4:f5
+            f2:f3
+            f0:f1
+            ee:ef
+            ec:ed
+            ea:eb
+            e8:e9
+            e6:e7
+            e4:e5
+            e2:e3
+            e0:e1
+            </hdf5:DataFromFile>
+         </hdf5:Data>
+      </hdf5:Dataset>
+   </hdf5:Group>
+</hdf5:RootGroup>
+</hdf5:HDF5-File>
diff --git a/tools/testfiles/tbitfields_le.h5.xml b/tools/testfiles/tbitfields_le.h5.xml
new file mode 100644
index 0000000..c8ba026
--- /dev/null
+++ b/tools/testfiles/tbitfields_le.h5.xml
@@ -0,0 +1,103 @@
+<?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_696" H5Path="/">
+   <hdf5:Group Name="typetests" OBJ-XID="xid_1344" H5Path="/typetests" Parents="xid_696" H5ParentPaths="/" >
+      <hdf5:Dataset Name="bitfield_1" OBJ-XID="xid_1720" H5Path= "/typetests/bitfield_1" Parents="xid_1344" H5ParentPaths="/typetests">
+         <hdf5:StorageLayout>
+            <hdf5:ContiguousLayout/>
+         </hdf5:StorageLayout>
+         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+            <hdf5:FillValue>
+               <hdf5:NoFill/>
+            </hdf5:FillValue>
+         </hdf5:FillValueInfo>
+         <hdf5:Dataspace>
+            <hdf5:SimpleDataspace Ndims="1">
+               <hdf5:Dimension  DimSize="32" MaxDimSize="32"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <hdf5:DataType>
+            <hdf5:AtomicType>
+               <hdf5:BitfieldType ByteOrder="LE" Size="1"/>
+            </hdf5:AtomicType>
+         </hdf5:DataType>
+         <hdf5:Data>
+            <hdf5:DataFromFile>
+            0xff
+            0xfe
+            0xfd
+            0xfc
+            0xfb
+            0xfa
+            0xf9
+            0xf8
+            0xf7
+            0xf6
+            0xf5
+            0xf4
+            0xf3
+            0xf2
+            0xf1
+            0xf0
+            0xef
+            0xee
+            0xed
+            0xec
+            0xeb
+            0xea
+            0xe9
+            0xe8
+            0xe7
+            0xe6
+            0xe5
+            0xe4
+            0xe3
+            0xe2
+            0xe1
+            0xe0
+            </hdf5:DataFromFile>
+         </hdf5:Data>
+      </hdf5:Dataset>
+      <hdf5:Dataset Name="bitfield_2" OBJ-XID="xid_2352" H5Path= "/typetests/bitfield_2" Parents="xid_1344" H5ParentPaths="/typetests">
+         <hdf5:StorageLayout>
+            <hdf5:ContiguousLayout/>
+         </hdf5:StorageLayout>
+         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+            <hdf5:FillValue>
+               <hdf5:NoFill/>
+            </hdf5:FillValue>
+         </hdf5:FillValueInfo>
+         <hdf5:Dataspace>
+            <hdf5:SimpleDataspace Ndims="1">
+               <hdf5:Dimension  DimSize="16" MaxDimSize="16"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <hdf5:DataType>
+            <hdf5:AtomicType>
+               <hdf5:BitfieldType ByteOrder="LE" Size="2"/>
+            </hdf5:AtomicType>
+         </hdf5:DataType>
+         <hdf5:Data>
+            <hdf5:DataFromFile>
+            ff:fe
+            fd:fc
+            fb:fa
+            f9:f8
+            f7:f6
+            f5:f4
+            f3:f2
+            f1:f0
+            ef:ee
+            ed:ec
+            eb:ea
+            e9:e8
+            e7:e6
+            e5:e4
+            e3:e2
+            e1:e0
+            </hdf5:DataFromFile>
+         </hdf5:Data>
+      </hdf5:Dataset>
+   </hdf5:Group>
+</hdf5:RootGroup>
+</hdf5:HDF5-File>
-- 
cgit v0.12