[svn-r6913] Purpose:

bug fix and enhancement


Description:
combined the --simple option to the display of NATIVE datatypes
with the -S option , the print of the datatype will always display the full description
making it possible to do an automatic test for catching differences on output

made the case for printing the type of bitfield data, which was not handled

the new test generates a dataset with 10 attributes, each one a different datatype

Platforms tested:


Windows 2000 (octopus)
Linux 2.4 (rockaway)
SunOS 5.7 (arabica)
IRIX 6.5 (modi4)



Misc. update:

2 files changed, 48 insertions, 0 deletions

diff --git a/tools/testfiles/tattr2.h5 b/tools/testfiles/tattr2.h5
new file mode 100644
index 0000000..c154a0b
--- /dev/null
+++ b/tools/testfiles/tattr2.h5
diff --git a/tools/testfiles/tattr2.ls b/tools/testfiles/tattr2.ls
new file mode 100644
index 0000000..bb934d8
--- /dev/null
+++ b/tools/testfiles/tattr2.ls
@@ -0,0 +1,48 @@
+#############################
+ output for 'h5ls -w80 -v -S tattr2.h5'
+#############################
+Opened "tattr2.h5" with sec2 driver.
+dset                     Dataset {2/2}
+    Attribute: string    scalar
+        Type:      17-byte null-terminated ASCII string
+        Data:  "string attribute"
+    Attribute: bitfield  {2}
+        Type:      8-bit bitfield little-endian
+        Data:  0x01, 0x02
+    Attribute: opaque    {2}
+        Type:      1-byte opaque type
+               (tag = "1-byte opaque type")
+        Data:  0x01, 0x02
+    Attribute: compound  {2}
+        Type:      struct {
+                   "a"                +0    32-bit little-endian integer
+                   "b"                +4    IEEE 32-bit little-endian float
+               } 8 bytes
+        Data:  {1, 1}, {2, 2}
+    Attribute: reference {2}
+        Type:      object reference
+        Data:  DATASET-0:1:0:976, DATASET-0:1:0:976
+    Attribute: enum      {2}
+        Type:      enum 32-bit little-endian integer {
+                   RED              = 0
+                   GREEN            = 1
+               }
+        Data:  RED, RED
+    Attribute: vlen      {2}
+        Type:      variable length of
+                   32-bit little-endian integer
+        Data:  (0), (10,11)
+    Attribute: array     {2}
+        Type:      [3] 32-bit little-endian integer
+        Data:  [1,1,1], [2,2,2]
+    Attribute: integer   {2}
+        Type:      32-bit little-endian integer
+        Data:  0, 0
+    Attribute: float     {2}
+        Type:      IEEE 32-bit little-endian float
+        Data:  0, 0
+    Location:  0:1:0:976
+    Links:     1
+    Modified:  2003-05-19 21:08:18 CDT
+    Storage:   8 logical bytes, 0 allocated bytes
+    Type:      32-bit little-endian integer