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/h5repack | |
| 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/h5repack')
| -rw-r--r-- | tools/h5repack/h5repack.sh.in | 8 | ||||
| -rw-r--r-- | tools/h5repack/testfiles/README | 5 | ||||
| -rw-r--r-- | tools/h5repack/testfiles/h5repack_nested_8bit_enum.h5 | bin | 0 -> 273992 bytes | |||
| -rw-r--r-- | tools/h5repack/testfiles/h5repack_nested_8bit_enum_deflated.h5 | bin | 0 -> 120630 bytes |
4 files changed, 13 insertions, 0 deletions
diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in index e3bb939..4a32491 100644 --- a/tools/h5repack/h5repack.sh.in +++ b/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) diff --git a/tools/h5repack/testfiles/README b/tools/h5repack/testfiles/README new file mode 100644 index 0000000..4096dee --- /dev/null +++ b/tools/h5repack/testfiles/README @@ -0,0 +1,5 @@ +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. The non-deflated version is produced by h5repack. diff --git a/tools/h5repack/testfiles/h5repack_nested_8bit_enum.h5 b/tools/h5repack/testfiles/h5repack_nested_8bit_enum.h5 Binary files differnew file mode 100644 index 0000000..f1bd8e9 --- /dev/null +++ b/tools/h5repack/testfiles/h5repack_nested_8bit_enum.h5 diff --git a/tools/h5repack/testfiles/h5repack_nested_8bit_enum_deflated.h5 b/tools/h5repack/testfiles/h5repack_nested_8bit_enum_deflated.h5 Binary files differnew file mode 100644 index 0000000..2e66da2 --- /dev/null +++ b/tools/h5repack/testfiles/h5repack_nested_8bit_enum_deflated.h5 |