[svn-r8826] Purpose:

h5dump new tests

Description:
added more tests for the escape/not escape feature for string data (with vlen, with
compound, with char data)


Solution:

Platforms tested:
linux
solaris
AIX

Misc. update:

17 files changed, 151 insertions, 37 deletions

diff --git a/tools/testfiles/tallfilters.ddl b/tools/testfiles/tallfilters.ddl
index 4f54e9a..e3121d8 100644
--- a/tools/testfiles/tallfilters.ddl
+++ b/tools/testfiles/tallfilters.ddl
@@ -23,7 +23,7 @@ DATASET "all" {
    }
    FILLVALUE {
       FILL_TIME H5D_FILL_TIME_IFSET
-      VALUE  -99   
+      VALUE  0   
    }
    ALLOCATION_TIME {
       H5D_ALLOC_TIME_INCR
diff --git a/tools/testfiles/tchunked.ddl b/tools/testfiles/tchunked.ddl
index 339a890..ba18776 100644
--- a/tools/testfiles/tchunked.ddl
+++ b/tools/testfiles/tchunked.ddl
@@ -15,7 +15,7 @@ COMMENT "This is a dataset with chunked storage"
    }
    FILLVALUE {
       FILL_TIME H5D_FILL_TIME_IFSET
-      VALUE  -99   
+      VALUE  0   
    }
    ALLOCATION_TIME {
       H5D_ALLOC_TIME_INCR
diff --git a/tools/testfiles/tcompact.ddl b/tools/testfiles/tcompact.ddl
index 3aaff2e..f970ce5 100644
--- a/tools/testfiles/tcompact.ddl
+++ b/tools/testfiles/tcompact.ddl
@@ -15,7 +15,7 @@ COMMENT "This is a dataset with compact storage"
    }
    FILLVALUE {
       FILL_TIME H5D_FILL_TIME_IFSET
-      VALUE  -99   
+      VALUE  0   
    }
    ALLOCATION_TIME {
       H5D_ALLOC_TIME_EARLY
diff --git a/tools/testfiles/tcontiguos.ddl b/tools/testfiles/tcontiguos.ddl
index a79b109..2828f8c 100644
--- a/tools/testfiles/tcontiguos.ddl
+++ b/tools/testfiles/tcontiguos.ddl
@@ -16,7 +16,7 @@ COMMENT "This is a dataset with contiguous storage"
    }
    FILLVALUE {
       FILL_TIME H5D_FILL_TIME_IFSET
-      VALUE  -99   
+      VALUE  0   
    }
    ALLOCATION_TIME {
       H5D_ALLOC_TIME_LATE
diff --git a/tools/testfiles/tdeflate.ddl b/tools/testfiles/tdeflate.ddl
index 1701a5b..fc98432 100644
--- a/tools/testfiles/tdeflate.ddl
+++ b/tools/testfiles/tdeflate.ddl
@@ -14,7 +14,7 @@ DATASET "deflate" {
    }
    FILLVALUE {
       FILL_TIME H5D_FILL_TIME_IFSET
-      VALUE  -99   
+      VALUE  0   
    }
    ALLOCATION_TIME {
       H5D_ALLOC_TIME_INCR
diff --git a/tools/testfiles/tfilters.h5 b/tools/testfiles/tfilters.h5
index ff5bec0..8933967 100644
--- a/tools/testfiles/tfilters.h5
+++ b/tools/testfiles/tfilters.h5
diff --git a/tools/testfiles/tfletcher32.ddl b/tools/testfiles/tfletcher32.ddl
index bb77e7d..9395f4a 100644
--- a/tools/testfiles/tfletcher32.ddl
+++ b/tools/testfiles/tfletcher32.ddl
@@ -14,7 +14,7 @@ DATASET "fletcher32" {
    }
    FILLVALUE {
       FILL_TIME H5D_FILL_TIME_IFSET
-      VALUE  -99   
+      VALUE  0   
    }
    ALLOCATION_TIME {
       H5D_ALLOC_TIME_INCR
diff --git a/tools/testfiles/tfvalues.h5 b/tools/testfiles/tfvalues.h5
index 53879aa..cb3172c 100644
--- a/tools/testfiles/tfvalues.h5
+++ b/tools/testfiles/tfvalues.h5
diff --git a/tools/testfiles/tindiceslarge.ddl b/tools/testfiles/tindiceslarge.ddl
index db72630..0b2a297 100644
--- a/tools/testfiles/tindiceslarge.ddl
+++ b/tools/testfiles/tindiceslarge.ddl
@@ -8,7 +8,7 @@ DATASET "3d" {
    STORAGE_LAYOUT {
       CONTIGUOUS
       SIZE 1600
-      OFFSET 48688
+      OFFSET 42544
    }
    FILTERS {
       NONE
diff --git a/tools/testfiles/tnofilename.ddl b/tools/testfiles/tnofilename.ddl
index db85fab..36cbcad 100644
--- a/tools/testfiles/tnofilename.ddl
+++ b/tools/testfiles/tnofilename.ddl
@@ -22,10 +22,6 @@ usage: h5dump [OPTIONS] file
      -o F, --output=F     Output raw data into file F
      -t P, --datatype=P   Print the specified named data type
      -w N, --width=N      Set the number of columns of output
-     -L                   Do not print soft links
-     -G                   Do not print groups
-     -T                   Do not print named datatypes
-     -E                   Do not print datasets
      -x, --xml            Output in XML using Schema
      -u, --use-dtd        Output in XML using DTD
      -D U, --xml-dtd=U    Use the DTD or schema at U
diff --git a/tools/testfiles/tshuffle.ddl b/tools/testfiles/tshuffle.ddl
index 494e9dd..00f8e4a 100644
--- a/tools/testfiles/tshuffle.ddl
+++ b/tools/testfiles/tshuffle.ddl
@@ -14,7 +14,7 @@ DATASET "shuffle" {
    }
    FILLVALUE {
       FILL_TIME H5D_FILL_TIME_IFSET
-      VALUE  -99   
+      VALUE  0   
    }
    ALLOCATION_TIME {
       H5D_ALLOC_TIME_INCR
diff --git a/tools/testfiles/tstr3.h5 b/tools/testfiles/tstr3.h5
new file mode 100644
index 0000000..5dee4c5
--- /dev/null
+++ b/tools/testfiles/tstr3.h5
diff --git a/tools/testfiles/tstring.ddl b/tools/testfiles/tstring.ddl
index bd21463..53ff8a6 100644
--- a/tools/testfiles/tstring.ddl
+++ b/tools/testfiles/tstring.ddl
@@ -1,20 +1,74 @@
 #############################
-Expected output for 'h5dump -d string tfilters.h5'
+Expected output for 'h5dump tstr3.h5'
 #############################
-HDF5 "tfilters.h5" {
-DATASET "string" {
-   DATATYPE  H5T_STRING {
-         STRSIZE 73;
-         STRPAD H5T_STR_NULLTERM;
-         CSET H5T_CSET_ASCII;
-         CTYPE H5T_C_S1;
-      }
-   DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
-   DATA {
-   (0): "quote "  backspace form feed new line
+HDF5 "tstr3.h5" {
+GROUP "/" {
+   DATASET "str1" {
+      DATATYPE  H5T_STRING {
+            STRSIZE 73;
+            STRPAD H5T_STR_NULLTERM;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         }
+      DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
+      DATA {
+      (0): "quote "  backspace form feed new line
             tab	 new line
             carriage return
            "
+      }
+   }
+   DATASET "str2" {
+      DATATYPE  H5T_STRING {
+            STRSIZE H5T_VARIABLE;
+            STRPAD H5T_STR_NULLTERM;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
+      DATA {
+      (0): "Four score and seven
+            years ago our forefathers brought forth on this continent a new nation,",
+      (1): "conceived in liberty
+            and dedicated to the proposition that all men are created equal.",
+      (2): "Now we are engaged
+            in a great civil war,",
+      (3): "testing whether that
+            nation or any nation so conceived and so dedicated can long endure."
+      }
+   }
+   DATASET "str3" {
+      DATATYPE  H5T_COMPOUND {
+         H5T_STD_I32LE "a";
+         H5T_STRING {
+            STRSIZE 255;
+            STRPAD H5T_STR_NULLTERM;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         } "str";
+      }
+      DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
+      DATA {
+      (0): {
+            24,
+            "Four score and seven
+            years ago our forefathers brought forth on this continent a new nation"
+         }
+      }
+   }
+   DATASET "str4" {
+      DATATYPE  H5T_STD_I8LE
+      DATASPACE  SIMPLE { ( 93 ) / ( 93 ) }
+      DATA {
+      (0): 70, 111, 117, 114, 32, 115, 99, 111, 114, 101, 32, 97, 110,
+      (13): 100, 32, 115, 101, 118, 101, 110, 10, 32, 121, 101, 97,
+      (25): 114, 115, 32, 97, 103, 111, 32, 111, 117, 114, 32, 102,
+      (37): 111, 114, 101, 102, 97, 116, 104, 101, 114, 115, 32, 98,
+      (49): 114, 111, 117, 103, 104, 116, 32, 102, 111, 114, 116,
+      (60): 104, 32, 111, 110, 32, 116, 104, 105, 115, 32, 99, 111,
+      (72): 110, 116, 105, 110, 101, 110, 116, 32, 97, 32, 110, 101,
+      (84): 119, 32, 110, 97, 116, 105, 111, 110, 0
+      }
    }
 }
 }
diff --git a/tools/testfiles/tstring2.ddl b/tools/testfiles/tstring2.ddl
new file mode 100644
index 0000000..ddfa67c
--- /dev/null
+++ b/tools/testfiles/tstring2.ddl
@@ -0,0 +1,15 @@
+#############################
+Expected output for 'h5dump -r -d str4 tstr3.h5'
+#############################
+HDF5 "tstr3.h5" {
+DATASET "str4" {
+   DATATYPE  H5T_STD_I8LE
+   DATASPACE  SIMPLE { ( 93 ) / ( 93 ) }
+   DATA {
+         "Four score and seven
+            years ago our fo"
+         "refathers brought forth on this continent a new n"
+         "ation\000"
+   }
+}
+}
diff --git a/tools/testfiles/tstringe.ddl b/tools/testfiles/tstringe.ddl
index ffab45b..7e22e5c 100644
--- a/tools/testfiles/tstringe.ddl
+++ b/tools/testfiles/tstringe.ddl
@@ -1,17 +1,66 @@
 #############################
-Expected output for 'h5dump -e -d string tfilters.h5'
+Expected output for 'h5dump -e tstr3.h5'
 #############################
-HDF5 "tfilters.h5" {
-DATASET "string" {
-   DATATYPE  H5T_STRING {
-         STRSIZE 73;
-         STRPAD H5T_STR_NULLTERM;
-         CSET H5T_CSET_ASCII;
-         CTYPE H5T_C_S1;
+HDF5 "tstr3.h5" {
+GROUP "/" {
+   DATASET "str1" {
+      DATATYPE  H5T_STRING {
+            STRSIZE 73;
+            STRPAD H5T_STR_NULLTERM;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         }
+      DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
+      DATA {
+      (0): "quote \"  backspace\b form feed\f new line\n tab\t new line\n carriage return\r"
+      }
+   }
+   DATASET "str2" {
+      DATATYPE  H5T_STRING {
+            STRSIZE H5T_VARIABLE;
+            STRPAD H5T_STR_NULLTERM;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
+      DATA {
+      (0): "Four score and seven\n years ago our forefathers brought forth on this continent a new nation,",
+      (1): "conceived in liberty\n and dedicated to the proposition that all men are created equal.",
+      (2): "Now we are engaged\n in a great civil war,",
+      (3): "testing whether that\n nation or any nation so conceived and so dedicated can long endure."
+      }
+   }
+   DATASET "str3" {
+      DATATYPE  H5T_COMPOUND {
+         H5T_STD_I32LE "a";
+         H5T_STRING {
+            STRSIZE 255;
+            STRPAD H5T_STR_NULLTERM;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         } "str";
+      }
+      DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
+      DATA {
+      (0): {
+            24,
+            "Four score and seven\n years ago our forefathers brought forth on this continent a new nation"
+         }
+      }
+   }
+   DATASET "str4" {
+      DATATYPE  H5T_STD_I8LE
+      DATASPACE  SIMPLE { ( 93 ) / ( 93 ) }
+      DATA {
+      (0): 70, 111, 117, 114, 32, 115, 99, 111, 114, 101, 32, 97, 110,
+      (13): 100, 32, 115, 101, 118, 101, 110, 10, 32, 121, 101, 97,
+      (25): 114, 115, 32, 97, 103, 111, 32, 111, 117, 114, 32, 102,
+      (37): 111, 114, 101, 102, 97, 116, 104, 101, 114, 115, 32, 98,
+      (49): 114, 111, 117, 103, 104, 116, 32, 102, 111, 114, 116,
+      (60): 104, 32, 111, 110, 32, 116, 104, 105, 115, 32, 99, 111,
+      (72): 110, 116, 105, 110, 101, 110, 116, 32, 97, 32, 110, 101,
+      (84): 119, 32, 110, 97, 116, 105, 111, 110, 0
       }
-   DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
-   DATA {
-   (0): "quote \"  backspace\b form feed\f new line\n tab\t new line\n carriage return\r"
    }
 }
 }
diff --git a/tools/testfiles/tszip.ddl b/tools/testfiles/tszip.ddl
index a15d3a2..4c6af47 100644
--- a/tools/testfiles/tszip.ddl
+++ b/tools/testfiles/tszip.ddl
@@ -20,7 +20,7 @@ DATASET "szip" {
    }
    FILLVALUE {
       FILL_TIME H5D_FILL_TIME_IFSET
-      VALUE  -99   
+      VALUE  0   
    }
    ALLOCATION_TIME {
       H5D_ALLOC_TIME_INCR
diff --git a/tools/testfiles/tuserfilter.ddl b/tools/testfiles/tuserfilter.ddl
index f7c0df3..5549741 100644
--- a/tools/testfiles/tuserfilter.ddl
+++ b/tools/testfiles/tuserfilter.ddl
@@ -17,7 +17,7 @@ DATASET "myfilter" {
       }
       FILLVALUE {
          FILL_TIME H5D_FILL_TIME_IFSET
-         VALUE  -99      
+         VALUE  0      
       }
       ALLOCATION_TIME {
          H5D_ALLOC_TIME_INCR