[svn-r8647] Purpose:

h5dump update

Description:
updated the h5dump test files  generator , so that it coincides with the 1.6 branch

Solution:

Platforms tested:
linux (small)

Misc. update:

12 files changed, 59 insertions, 17 deletions

diff --git a/tools/testfiles/tchunked.ddl b/tools/testfiles/tchunked.ddl
index 27cdbf8..5d4571b 100644
--- a/tools/testfiles/tchunked.ddl
+++ b/tools/testfiles/tchunked.ddl
@@ -3,6 +3,16 @@ Expected output for 'h5dump -H -p -d chunked tfilters.h5'
 #############################
 HDF5 "tfilters.h5" {
 DATASET "chunked" {
+COMMENT "This is a dataset with chunked storage"
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   STORAGE_LAYOUT CHUNKED {
+      SIZE 800 ( 10, 5 )
    }
+   FILLVALUE {
+      FILL_TIME IFSET
+      ALLOC_TIME INCR
+      VALUE  -99   
+   }
+}
 }
-h5dump error: unable to open dataset "chunked"
diff --git a/tools/testfiles/tcompact.ddl b/tools/testfiles/tcompact.ddl
index 8c47e36..ae4f3e7 100644
--- a/tools/testfiles/tcompact.ddl
+++ b/tools/testfiles/tcompact.ddl
@@ -12,7 +12,7 @@ COMMENT "This is a dataset with compact storage"
    FILLVALUE {
       FILL_TIME IFSET
       ALLOC_TIME EARLY
-      VALUE  0   
+      VALUE  -99   
    }
 }
 }
diff --git a/tools/testfiles/tcontents.ddl b/tools/testfiles/tcontents.ddl
index 2d7ad18..4838c0a 100644
--- a/tools/testfiles/tcontents.ddl
+++ b/tools/testfiles/tcontents.ddl
@@ -6,17 +6,18 @@ FILE_CONTENTS {
  dataset    /all
  dataset    /bitfield
  dataset    /char
+ dataset    /chunked
  dataset    /compact
  dataset    /contiguous
  dataset    /deflate
  dataset    /enum
  dataset    /external
- dataset    /fill early
- dataset    /fill ifset
- dataset    /fill never
+ dataset    /fill_early
+ dataset    /fill_ifset
+ dataset    /fill_never
  dataset    /fletcher32
- datatype   /my type
  dataset    /myfilter
+ datatype   /mytype
  datatype   /myvlen
  dataset    /reference
  dataset    /shuffle
diff --git a/tools/testfiles/tdeflate.ddl b/tools/testfiles/tdeflate.ddl
index 2423c47..8cc5b3a 100644
--- a/tools/testfiles/tdeflate.ddl
+++ b/tools/testfiles/tdeflate.ddl
@@ -14,7 +14,7 @@ DATASET "deflate" {
    FILLVALUE {
       FILL_TIME IFSET
       ALLOC_TIME INCR
-      VALUE  0   
+      VALUE  -99   
    }
 }
 }
diff --git a/tools/testfiles/tfillearly.ddl b/tools/testfiles/tfillearly.ddl
index 95f89ae..b48d64f 100644
--- a/tools/testfiles/tfillearly.ddl
+++ b/tools/testfiles/tfillearly.ddl
@@ -3,6 +3,15 @@ Expected output for 'h5dump -H -p -d fill_early tfilters.h5'
 #############################
 HDF5 "tfilters.h5" {
 DATASET "fill_early" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   STORAGE_LAYOUT CHUNKED {
+      SIZE 800 ( 10, 5 )
    }
+   FILLVALUE {
+      FILL_TIME ALLOC
+      ALLOC_TIME EARLY
+      VALUE  -99   
+   }
+}
 }
-h5dump error: unable to open dataset "fill_early"
diff --git a/tools/testfiles/tfillifset.ddl b/tools/testfiles/tfillifset.ddl
index 79e748c..b67f5c7 100644
--- a/tools/testfiles/tfillifset.ddl
+++ b/tools/testfiles/tfillifset.ddl
@@ -3,6 +3,15 @@ Expected output for 'h5dump -H -p -d fill_ifset tfilters.h5'
 #############################
 HDF5 "tfilters.h5" {
 DATASET "fill_ifset" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   STORAGE_LAYOUT CHUNKED {
+      SIZE 800 ( 10, 5 )
    }
+   FILLVALUE {
+      FILL_TIME IFSET
+      ALLOC_TIME EARLY
+      VALUE  -99   
+   }
+}
 }
-h5dump error: unable to open dataset "fill_ifset"
diff --git a/tools/testfiles/tfillnever.ddl b/tools/testfiles/tfillnever.ddl
index 38be076..92f19bc 100644
--- a/tools/testfiles/tfillnever.ddl
+++ b/tools/testfiles/tfillnever.ddl
@@ -3,6 +3,15 @@ Expected output for 'h5dump -H -p -d fill_never tfilters.h5'
 #############################
 HDF5 "tfilters.h5" {
 DATASET "fill_never" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+   STORAGE_LAYOUT CHUNKED {
+      SIZE 800 ( 10, 5 )
    }
+   FILLVALUE {
+      FILL_TIME NEVER
+      ALLOC_TIME EARLY
+      VALUE  -99   
+   }
+}
 }
-h5dump error: unable to open dataset "fill_never"
diff --git a/tools/testfiles/tfilters.h5 b/tools/testfiles/tfilters.h5
index 51a9bef..4a98421 100644
--- a/tools/testfiles/tfilters.h5
+++ b/tools/testfiles/tfilters.h5
diff --git a/tools/testfiles/tfletcher32.ddl b/tools/testfiles/tfletcher32.ddl
index 1b128cb..4e44439 100644
--- a/tools/testfiles/tfletcher32.ddl
+++ b/tools/testfiles/tfletcher32.ddl
@@ -14,7 +14,7 @@ DATASET "fletcher32" {
    FILLVALUE {
       FILL_TIME IFSET
       ALLOC_TIME INCR
-      VALUE  0   
+      VALUE  -99   
    }
 }
 }
diff --git a/tools/testfiles/treference.ddl b/tools/testfiles/treference.ddl
index 817bbaf..10fb199 100644
--- a/tools/testfiles/treference.ddl
+++ b/tools/testfiles/treference.ddl
@@ -4,9 +4,11 @@ Expected output for 'h5dump -d reference tfilters.h5'
 HDF5 "tfilters.h5" {
 DATASET "reference" {
    DATATYPE  H5T_REFERENCE
-   DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
+   DATASPACE  SIMPLE { ( 5 ) / ( 5 ) }
    DATA {
-        (0) DATASET 36216 /char , DATASET 35944 /string 
+        (0) DATASET 976 /compact , DATATYPE 15955 /myvlen ,
+        (2) DATASET 976 /compact , DATATYPE 15955 /myvlen ,
+        (4) DATASET 2376 /contiguous 
    }
 }
 }
diff --git a/tools/testfiles/tshuffle.ddl b/tools/testfiles/tshuffle.ddl
index aa80f6f..c68668c 100644
--- a/tools/testfiles/tshuffle.ddl
+++ b/tools/testfiles/tshuffle.ddl
@@ -14,7 +14,7 @@ DATASET "shuffle" {
    FILLVALUE {
       FILL_TIME IFSET
       ALLOC_TIME INCR
-      VALUE  0   
+      VALUE  -99   
    }
 }
 }
diff --git a/tools/testfiles/tstring.ddl b/tools/testfiles/tstring.ddl
index 9d15f17..d6df34b 100644
--- a/tools/testfiles/tstring.ddl
+++ b/tools/testfiles/tstring.ddl
@@ -4,15 +4,17 @@ Expected output for 'h5dump -e -d string tfilters.h5'
 HDF5 "tfilters.h5" {
 DATASET "string" {
    DATATYPE  H5T_STRING {
-         STRSIZE 12;
+         STRSIZE 57;
          STRPAD H5T_STR_NULLTERM;
          CSET H5T_CSET_ASCII;
          CTYPE H5T_C_S1;
       }
    DATASPACE  SIMPLE { ( 1 ) / ( 1 ) }
    DATA {
-        (0) "string
-            new"
+        (0) "this is
+            a string with three
+            newline
+            escape characters"
    }
 }
 }