[svn-r24654] HDFFV-8640: Remove XLATE_UTILITY

   Update tools testfiles

2 files changed, 113 insertions, 20 deletions

diff --git a/tools/h5dump/CMakeTests.cmake b/tools/h5dump/CMakeTests.cmake
index 9a17f25..2784b56 100644
--- a/tools/h5dump/CMakeTests.cmake
+++ b/tools/h5dump/CMakeTests.cmake
@@ -56,6 +56,8 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tchar1.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tchunked.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdattrintsize.ddl
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdintarray.ddl
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdints.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdintsize.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcomp-1.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcomp-2.ddl
@@ -98,6 +100,7 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicessub3.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicessub4.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicesyes.ddl
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tintsattrs.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tlarge_objname.ddl
       #${HDF5_TOOLS_SRC_DIR}/testfiles/tldouble.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tlonglinks.ddl
@@ -117,9 +120,6 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tnoddlfile.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tno-subset.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tnullspace.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/trawdatafile.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/trawssetfile.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/zerodim.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr1.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr2.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr3.ddl
@@ -134,10 +134,15 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/torderlinks1.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/torderlinks2.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tperror.ddl
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/trawdatafile.ddl
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/trawssetfile.ddl
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/treadfilter.ddl
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/treadintfilter.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/treference.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarintsize.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarattrintsize.ddl
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarintattrsize.ddl
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarintsize.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarstring.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tscaleoffset.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tshuffle.ddl
@@ -165,6 +170,7 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/twithddlfile.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/h5dump-help.txt
       ${HDF5_TOOLS_SRC_DIR}/testfiles/out3.h5import
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/zerodim.ddl
   )
   SET (HDF5_REFERENCE_EXP_FILES
       tall-6.exp
@@ -200,6 +206,8 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tbinary.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tchar.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdattrintsize.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdintarray.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdints.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdintsize.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound_complex.h5
@@ -231,6 +239,7 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrp_comments.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/thyperslab.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tintsattrs.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tlarge_objname.h5
       #${HDF5_TOOLS_SRC_DIR}/testfiles/tldouble.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tlonglinks.h5
@@ -246,12 +255,12 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcmpddt.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tno-subset.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tnullspace.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/zerodim.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarintsize.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarattrintsize.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarintattrsize.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarintsize.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarstring.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tsplit_file-m.h5
@@ -267,6 +276,7 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes5.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tvlstr.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tvms.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/zerodim.h5
   )
   SET (HDF5_ERROR_REFERENCE_TEST_FILES
       ${PROJECT_SOURCE_DIR}/errfiles/filter_fail.err
@@ -805,6 +815,10 @@
           tchunked.out.err
           tcmpdattrintsize.out
           tcmpdattrintsize.out.err
+          tcmpdintarray.out
+          tcmpdintarray.out.err
+          tcmpdints.out
+          tcmpdints.out.err
           tcmpdintsize.out
           tcmpdintsize.out.err
           tcomp-1.out
@@ -889,6 +903,8 @@
           texceedsubblock.out.err
           tindicesyes.out
           tindicesyes.out.err
+          tintsattrs.out
+          tintsattrs.out.err
           tlarge_objname.out
           tlarge_objname.out.err
           tldouble.out
@@ -907,12 +923,12 @@
 #          tstarfile.out.err
           tnamed_dtype_attr.out
           tnamed_dtype_attr.out.err
+          tnbit.out
+          tnbit.out.err
           tnestcomp-1.out
           tnestcomp-1.out.err
           tnestedcmpddt.out
           tnestedcmpddt.out.err
-          tnbit.out
-          tnbit.out.err
           tnoattrdata.out
           tnoattrdata.out.err
           tnoattrddl.out
@@ -923,18 +939,10 @@
           tnoddl.out.err
           tnoddlfile.out
           tnoddlfile.out.err
-          trawdatafile.out
-          trawdatafile.out.err
-          trawdatafile.txt
-          trawssetfile.out
-          trawssetfile.out.err
-          trawssetfile.txt
           tno-subset.out
           tno-subset.out.err
           tnullspace.out
           tnullspace.out.err
-          zerodim.out
-          zerodim.out.err
           tordergr1.out
           tordergr1.out.err
           tordergr2.out
@@ -963,14 +971,26 @@
           torderlinks2.out.err
           tperror.out
           tperror.out.err
+          trawdatafile.out
+          trawdatafile.out.err
+          trawdatafile.txt
+          trawssetfile.out
+          trawssetfile.out.err
+          trawssetfile.txt
+          treadfilter.out
+          treadfilter.out.err
+          treadintfilter.out
+          treadintfilter.out.err
           treference.out
           treference.out.err
           tsaf.out
           tsaf.out.err
-          tscalarintsize.out
-          tscalarintsize.out.err
           tscalarattrintsize.out
           tscalarattrintsize.out.err
+          tscalarintattrsize.out
+          tscalarintattrsize.out.err
+          tscalarintsize.out
+          tscalarintsize.out.err
           tscalarstring.out
           tscalarstring.out.err
           tscaleoffset.out
@@ -1025,6 +1045,8 @@
           twithddlfile.out
           twithddlfile.out.err
           twithddlfile.txt
+          zerodim.out
+          zerodim.out.err
     )
     SET_TESTS_PROPERTIES (H5DUMP-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
     IF (NOT "${last_test}" STREQUAL "")
@@ -1054,6 +1076,8 @@
   # test for signed/unsigned datasets
   ADD_H5_TEST (packedbits 0 --enable-error-stack packedbits.h5)
   # test for compound signed/unsigned datasets
+  ADD_H5_TEST (tcmpdintarray 0 --enable-error-stack tcmpdintarray.h5)
+  ADD_H5_TEST (tcmpdints 0 --enable-error-stack tcmpdints.h5)
   ADD_H5_TEST (tcmpdintsize 0 --enable-error-stack tcmpdintsize.h5)
   # test for signed/unsigned scalar datasets
   ADD_H5_TEST (tscalarintsize 0 --enable-error-stack tscalarintsize.h5)
@@ -1065,6 +1089,10 @@
   ADD_H5_TEST (tscalarattrintsize 0 --enable-error-stack tscalarattrintsize.h5)
   # test for string scalar dataset and attribute
   ADD_H5_TEST (tscalarstring 0 --enable-error-stack tscalarstring.h5)
+  # test for signed/unsigned scalar datasets with attributes
+  ADD_H5_TEST (tscalarintattrsize 0 --enable-error-stack tscalarintattrsize.h5)
+  # test for signed/unsigned datasets attributes
+  ADD_H5_TEST (tintsattrs 0 --enable-error-stack tintsattrs.h5)
   # test for displaying groups
   ADD_H5_TEST (tgroup-1 0 --enable-error-stack tgroup.h5)
   # test for displaying the selected groups
@@ -1287,6 +1315,45 @@
   # user defined
   ADD_H5_TEST (tuserfilter 0 --enable-error-stack -H  -p -d myfilter  tfilters.h5)
 
+
+# See which filters are usable (and skip tests for filters we
+# don't have).  Do this by searching H5pubconf.h to see which
+# filters are defined.
+
+# detect whether the encoder is present. 
+  IF (H5_HAVE_FILTER_DEFLATE)
+    SET (USE_FILTER_DEFLATE "true")
+  ENDIF (H5_HAVE_FILTER_DEFLATE)
+
+  IF (H5_HAVE_FILTER_SZIP)
+    SET (USE_FILTER_SZIP "true")
+  ENDIF (H5_HAVE_FILTER_SZIP)
+
+  IF (H5_HAVE_FILTER_SHUFFLE)
+    SET (USE_FILTER_SHUFFLE "true")
+  ENDIF (H5_HAVE_FILTER_SHUFFLE)
+
+  IF (H5_HAVE_FILTER_FLETCHER32)
+    SET (USE_FILTER_FLETCHER32 "true")
+  ENDIF (H5_HAVE_FILTER_FLETCHER32)
+
+  IF (H5_HAVE_FILTER_NBIT)
+    SET (USE_FILTER_NBIT "true")
+  ENDIF (H5_HAVE_FILTER_NBIT)
+
+  IF (H5_HAVE_FILTER_SCALEOFFSET)
+    SET (USE_FILTER_SCALEOFFSET "true")
+  ENDIF (H5_HAVE_FILTER_SCALEOFFSET)
+
+  IF (USE_FILTER_DEFLATE AND USE_FILTER_SHUFFLE AND USE_FILTER_FLETCHER32 AND USE_FILTER_NBIT AND USE_FILTER_SCALEOFFSET)
+    # data read internal filters
+    ADD_H5_TEST (treadintfilter 0 --enable-error-stack -d deflate -d shuffle -d fletcher32 -d nbit -d scaleoffset tfilters.h5)
+    IF (HDF5_ENABLE_SZIP_SUPPORT)
+      # data read all filters
+      ADD_H5_TEST (treadfilter 0 --enable-error-stack -d all -d szip tfilters.h5)
+    ENDIF (HDF5_ENABLE_SZIP_SUPPORT)
+  ENDIF (USE_FILTER_DEFLATE AND USE_FILTER_SHUFFLE AND USE_FILTER_FLETCHER32 AND USE_FILTER_NBIT AND USE_FILTER_SCALEOFFSET)
+
   # test for displaying objects with very long names
   ADD_H5_TEST (tlonglinks 0 --enable-error-stack tlonglinks.h5)
 
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index 381e772..6fd100f 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -17,6 +17,13 @@
 
 srcdir=@srcdir@
 
+USE_FILTER_SZIP="@USE_FILTER_SZIP@"
+USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@"
+USE_FILTER_SHUFFLE="@USE_FILTER_SHUFFLE@"
+USE_FILTER_FLETCHER32="@USE_FILTER_FLETCHER32@"
+USE_FILTER_NBIT="@USE_FILTER_NBIT@"
+USE_FILTER_SCALEOFFSET="@USE_FILTER_SCALEOFFSET@"
+
 TESTNAME=h5dump
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
@@ -128,6 +135,7 @@ $SRC_H5DUMP_TESTFILES/tgroup.h5
 $SRC_H5DUMP_TESTFILES/tgrp_comments.h5
 $SRC_H5DUMP_TESTFILES/thlink.h5
 $SRC_H5DUMP_TESTFILES/thyperslab.h5
+$SRC_H5DUMP_TESTFILES/tintsattrs.h5
 $SRC_H5DUMP_TESTFILES/tlarge_objname.h5
 #$SRC_H5DUMP_TESTFILES/tldouble.h5
 $SRC_H5DUMP_TESTFILES/tlonglinks.h5
@@ -147,8 +155,9 @@ $SRC_H5DUMP_TESTFILES/zerodim.h5
 $SRC_H5DUMP_TESTFILES/torderattr.h5
 $SRC_H5DUMP_TESTFILES/tordergr.h5
 $SRC_H5DUMP_TESTFILES/tsaf.h5
-$SRC_H5DUMP_TESTFILES/tscalarintsize.h5
 $SRC_H5DUMP_TESTFILES/tscalarattrintsize.h5
+$SRC_H5DUMP_TESTFILES/tscalarintattrsize.h5
+$SRC_H5DUMP_TESTFILES/tscalarintsize.h5
 $SRC_H5DUMP_TESTFILES/tscalarstring.h5
 $SRC_H5DUMP_TESTFILES/tslink.h5
 $SRC_H5DUMP_TESTFILES/tsplit_file-m.h5
@@ -257,6 +266,7 @@ $SRC_H5DUMP_TESTFILES/tindicessub2.ddl
 $SRC_H5DUMP_TESTFILES/tindicessub3.ddl
 $SRC_H5DUMP_TESTFILES/tindicessub4.ddl
 $SRC_H5DUMP_TESTFILES/tindicesyes.ddl
+$SRC_H5DUMP_TESTFILES/tintsattrs.ddl
 $SRC_H5DUMP_TESTFILES/tlarge_objname.ddl
 #$SRC_H5DUMP_TESTFILES/tldouble.ddl 
 $SRC_H5DUMP_TESTFILES/tlonglinks.ddl
@@ -296,10 +306,13 @@ $SRC_H5DUMP_TESTFILES/tordercontents2.ddl
 $SRC_H5DUMP_TESTFILES/torderlinks1.ddl
 $SRC_H5DUMP_TESTFILES/torderlinks2.ddl
 $SRC_H5DUMP_TESTFILES/tperror.ddl
+$SRC_H5DUMP_TESTFILES/treadfilter.ddl
+$SRC_H5DUMP_TESTFILES/treadintfilter.ddl
 $SRC_H5DUMP_TESTFILES/treference.ddl
 $SRC_H5DUMP_TESTFILES/tsaf.ddl
-$SRC_H5DUMP_TESTFILES/tscalarintsize.ddl
 $SRC_H5DUMP_TESTFILES/tscalarattrintsize.ddl
+$SRC_H5DUMP_TESTFILES/tscalarintattrsize.ddl
+$SRC_H5DUMP_TESTFILES/tscalarintsize.ddl
 $SRC_H5DUMP_TESTFILES/tscalarstring.ddl
 $SRC_H5DUMP_TESTFILES/tscaleoffset.ddl
 $SRC_H5DUMP_TESTFILES/tshuffle.ddl
@@ -945,6 +958,10 @@ TOOLTEST tattrintsize.ddl --enable-error-stack tattrintsize.h5
 TOOLTEST tcmpdattrintsize.ddl --enable-error-stack tcmpdattrintsize.h5
 # test for signed/unsigned scalar attributes
 TOOLTEST tscalarattrintsize.ddl --enable-error-stack tscalarattrintsize.h5
+# test for signed/unsigned scalar datasets with attributes
+TOOLTEST tscalarintattrsize.ddl --enable-error-stack tscalarintattrsize.h5
+# test for signed/unsigned datasets attributes
+TOOLTEST tintsattrs.ddl --enable-error-stack tintsattrs.h5
 # test for string scalar dataset attribute
 TOOLTEST tscalarstring.ddl --enable-error-stack tscalarstring.h5
 # test for displaying groups
@@ -1164,6 +1181,15 @@ TOOLTEST tallfilters.ddl --enable-error-stack -H -p -d all  tfilters.h5
 # user defined
 TOOLTEST tuserfilter.ddl --enable-error-stack -H  -p -d myfilter  tfilters.h5
 
+if test $USE_FILTER_DEFLATE = "yes" -a $USE_FILTER_SHUFFLE = "yes" -a $USE_FILTER_FLETCHER32 = "yes" -a $USE_FILTER_NBIT = "yes" -a $USE_FILTER_SCALEOFFSET = "yes" ; then
+  # data read internal filters
+  TOOLTEST treadintfilter.ddl --enable-error-stack -d deflate -d shuffle -d fletcher32 -d nbit -d scaleoffset tfilters.h5
+  if test $USE_FILTER_SZIP = "yes"; then
+    # data read
+    TOOLTEST treadfilter.ddl --enable-error-stack -d all -d szip tfilters.h5
+  fi
+fi
+
 # test for displaying objects with very long names
 TOOLTEST tlonglinks.ddl --enable-error-stack tlonglinks.h5