[svn-r8715] Purpose:

h5dump output change, new tests

Description:
the storage layout output format the storage layout output format  had some changes
same for the user defined filter
add an option (-y) for not printing the array indices (default is print indices )
the option for escaping non printable characters covers all characters (default is not escape)
(this might be not very portable, the test files are  tstring.ddl and tstringe.ddl )
add tests for the new options


Solution:

Platforms tested:
linux
solaris
AIX

Misc. update:

1 files changed, 23 insertions, 7 deletions

diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index 19aa89a..cb9d398 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -211,13 +211,15 @@ TOOLTEST tchar1.ddl -r tchar.h5
 # Missing file name
 TOOLTEST tnofilename.ddl
 
+
+
+
 # test for super block
 TOOLTEST tboot.ddl -H -B -d compact tfilters.h5
 
 # test for file contents
 TOOLTEST tcontents.ddl -n tfilters.h5
 
-
 # tests for storage layout
 # compact
 TOOLTEST tcompact.ddl -H -p -d compact tfilters.h5
@@ -229,16 +231,23 @@ TOOLTEST tchunked.ddl -H -p -d chunked tfilters.h5
 TOOLTEST texternal.ddl -H -p -d external tfilters.h5
 
 # Fill values
-TOOLTEST tfillearly.ddl -H -p -d fill_early tfilters.h5
-TOOLTEST tfillnever.ddl -H -p -d fill_never tfilters.h5
-TOOLTEST tfillifset.ddl -H -p -d fill_ifset tfilters.h5
+TOOLTEST tfillifset.ddl -H -p -d fill_time_ifset tfilters.h5
+TOOLTEST tfillalloc.ddl -H -p -d fill_time_alloc tfilters.h5
+TOOLTEST tfillnever.ddl -H -p -d fill_time_never tfilters.h5
+TOOLTEST tfillearly.ddl -H -p -d alloc_time_early tfilters.h5
+TOOLTEST tfillincr.ddl  -H -p -d alloc_time_incr tfilters.h5
+TOOLTEST tfilllate.ddl  -H -p -d alloc_time_late tfilters.h5
 
 # references , print path
 TOOLTEST treference.ddl -d reference  tfilters.h5
 
-# string , print new lines
-TOOLTEST tstring.ddl -e -d string  tfilters.h5
+# escape/not escape non printable characters
+TOOLTEST tstringe.ddl -e -d string  tfilters.h5
+TOOLTEST tstring.ddl -d string  tfilters.h5
 
+# array indices print/not print
+TOOLTEST tindicesyes.ddl -d compact  tfilters.h5
+TOOLTEST tindicesno.ddl -y -d compact  tfilters.h5
 
 # tests for filters
 # SZIP
@@ -269,8 +278,15 @@ if test $USE_FILTER_FLETCHER32 != "yes"; then
 else
  TOOLTEST tfletcher32.ddl $option
 fi
+# all
+option="-H -p -d all  tfilters.h5"
+if test $USE_FILTER_FLETCHER32 != "yes" -o  $USE_FILTER_SZIP != "yes" -o  $USE_FILTER_DEFLATE != "yes" -o  $USE_FILTER_SHUFFLE != "yes" ; then
+ SKIP $option
+else
+ TOOLTEST tallfilters.ddl $option
+fi
 # user defined
-TOOLTEST tuserfilter.ddl -H  -d myfilter  tfilters.h5
+TOOLTEST tuserfilter.ddl -H  -p -d myfilter  tfilters.h5
     
 # test for displaying dataset and attribute of null space
 TOOLTEST tnullspace.ddl tnullspace.h5