diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2015-04-07 18:30:41 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2015-04-07 18:30:41 (GMT) |
| commit | e7faa6e220f375d6a1cc7e240e13e29b018b153f (patch) | |
| tree | b21fb070e57c6e6a1f08c3a2a0f4c2aa7211724c /tools/h5dump | |
| parent | 1a0a3d63499e53d7b6a416218d5caa73eb1c34d6 (diff) | |
| download | hdf5-e7faa6e220f375d6a1cc7e240e13e29b018b153f.zip hdf5-e7faa6e220f375d6a1cc7e240e13e29b018b153f.tar.gz hdf5-e7faa6e220f375d6a1cc7e240e13e29b018b153f.tar.bz2 | |
[svn-r26752] Merged r26750 and r26751 from trunk.
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.
Diffstat (limited to 'tools/h5dump')
| -rw-r--r-- | tools/h5dump/CMakeTests.cmake | 3 | ||||
| -rw-r--r-- | tools/h5dump/testh5dump.sh.in | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/tools/h5dump/CMakeTests.cmake b/tools/h5dump/CMakeTests.cmake index ac61331..49a5acd 100644 --- a/tools/h5dump/CMakeTests.cmake +++ b/tools/h5dump/CMakeTests.cmake @@ -65,7 +65,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 @@ -214,7 +213,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 @@ -1155,7 +1153,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) diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in index d65c4ff..49c947d 100644 --- a/tools/h5dump/testh5dump.sh.in +++ b/tools/h5dump/testh5dump.sh.in @@ -103,7 +103,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 @@ -226,7 +225,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 @@ -1029,7 +1027,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 |