[svn-r26750] HDFFV-8667: h5repack crashes on enumerated 8-bit type nested in compound type.

Added the testing to h5repack where it belongs.
Undo the tests added to h5dump.

Tested: h5committested plus tested in jam by hand.

MANIFEST

@@ -1469,8 +1469,6 @@
 ./tools/testfiles/tcompound.h5
 ./tools/testfiles/tcompound2.h5
 ./tools/testfiles/tcompound_complex.h5
-./tools/testfiles/tcompound_enum.ddl
-./tools/testfiles/tcompound_enum.h5
 ./tools/testfiles/tdatareg.h5
 ./tools/testfiles/tdatareg.ddl 
 ./tools/testfiles/tdataregR.ddl 
@@ -2128,6 +2126,7 @@
 ./tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5
 
 #test files for h5repack
+./tools/h5repack/testfiles/README
 ./tools/h5repack/testfiles/h5repack_attr.h5
 ./tools/h5repack/testfiles/h5repack_attr_refs.h5
 ./tools/h5repack/testfiles/h5repack_deflate.h5
@@ -2145,6 +2144,8 @@
 ./tools/h5repack/testfiles/h5repack_layout3.h5
 ./tools/h5repack/testfiles/h5repack_layout.UD.h5
 ./tools/h5repack/testfiles/h5repack_named_dtypes.h5
+./tools/h5repack/testfiles/h5repack_nested_8bit_enum_deflated.h5
+./tools/h5repack/testfiles/h5repack_nested_8bit_enum.h5
 ./tools/h5repack/testfiles/h5repack_nbit.h5
 ./tools/h5repack/testfiles/h5repack_objs.h5
 ./tools/h5repack/testfiles/h5repack_refs.h5

tools/h5dump/CMakeTests.cmake

@@ -66,7 +66,6 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcomp-3.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcomp-4.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompact.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound_enum.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcontents.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcontiguos.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tdatareg.ddl
@@ -216,7 +215,6 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdintsize.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound_complex.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound_enum.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tdatareg.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty.h5
@@ -1159,7 +1157,6 @@
   #test for the nested compound type
   ADD_H5_TEST (tnestcomp-1 0 --enable-error-stack tnestedcomp.h5)
   ADD_H5_TEST (tnestedcmpddt 0 --enable-error-stack tnestedcmpddt.h5)
-  #ADD_H5_TEST (tcompound_enum 0 --enable-error-stack tcompound_enum.h5)
 
   # test for options
   ADD_H5ERR_MASK_TEST (tall-1 0 --enable-error-stack tall.h5)

tools/h5dump/testh5dump.sh.in

@@ -104,7 +104,6 @@ $SRC_H5DUMP_TESTFILES/tcmpdattrintsize.h5
 $SRC_H5DUMP_TESTFILES/tcmpdintsize.h5
 $SRC_H5DUMP_TESTFILES/tcompound.h5
 $SRC_H5DUMP_TESTFILES/tcompound_complex.h5
-$SRC_H5DUMP_TESTFILES/tcompound_enum.h5
 $SRC_H5DUMP_TESTFILES/tdatareg.h5
 $SRC_H5DUMP_TESTFILES/tdset.h5
 $SRC_H5DUMP_TESTFILES/tempty.h5
@@ -228,7 +227,6 @@ $SRC_H5DUMP_TESTFILES/tcomp-1.ddl
 $SRC_H5DUMP_TESTFILES/tcomp-2.ddl
 $SRC_H5DUMP_TESTFILES/tcomp-3.ddl
 $SRC_H5DUMP_TESTFILES/tcomp-4.ddl
-$SRC_H5DUMP_TESTFILES/tcompound_enum.ddl
 $SRC_H5DUMP_TESTFILES/tcompact.ddl
 $SRC_H5DUMP_TESTFILES/tcontents.ddl
 $SRC_H5DUMP_TESTFILES/tcontiguos.ddl
@@ -1031,7 +1029,6 @@ TOOLTEST tcomp-4.ddl --enable-error-stack tcompound_complex.h5
 #test for the nested compound type
 TOOLTEST tnestcomp-1.ddl --enable-error-stack tnestedcomp.h5
 TOOLTEST tnestedcmpddt.ddl --enable-error-stack tnestedcmpddt.h5
-TOOLTEST ignorecase tcompound_enum.ddl --enable-error-stack tcompound_enum.h5
 
 # test for options
 TOOLTEST4 tall-1.ddl --enable-error-stack tall.h5

tools/h5repack/h5repack.sh.in

@@ -93,6 +93,8 @@ $SRC_H5REPACK_TESTFILES/h5repack_layouto.h5
 $SRC_H5REPACK_TESTFILES/h5repack_layout2.h5
 $SRC_H5REPACK_TESTFILES/h5repack_layout3.h5
 $SRC_H5REPACK_TESTFILES/h5repack_named_dtypes.h5
+$SRC_H5REPACK_TESTFILES/h5repack_nested_8bit_enum.h5
+$SRC_H5REPACK_TESTFILES/h5repack_nested_8bit_enum_deflated.h5
 $SRC_H5REPACK_TESTFILES/h5repack_nbit.h5
 $SRC_H5REPACK_TESTFILES/h5repack_objs.h5
 $SRC_H5REPACK_TESTFILES/h5repack_refs.h5
@@ -701,6 +703,12 @@ TOOLTEST hlink h5repack_hlink.h5
 TOOLTEST layout h5repack_layout.h5
 TOOLTEST early h5repack_early.h5
 
+# nested 8bit enum in both deflated and non-deflated datafiles
+if [ $USE_FILTER_DEFLATE != "yes" ]; then
+TOOLTEST nested_8bit_enum h5repack_nested_8bit_enum.h5
+else
+TOOLTEST nested_8bit_enum h5repack_nested_8bit_enum_deflated.h5
+fi
 
 # use h5repack_layout.h5 to write some filters  (this file has  no filters)
 

tools/h5repack/testfiles/README

@@ -1,4 +1,5 @@
-tcompound_enum.h5
+h5repack_nested_8bit_enum_deflated.h5:
+h5repack_nested_8bit_enum.h5:
     enuberated 8bit type nested in compount type.  Original file provided
     by a user (HDFFV-8667) as a test file. Used h5copy to extract only the
-    Compound type dataset.
+    Compound type dataset. The non-deflated version is produced by h5repack.