summaryrefslogtreecommitdiffstats
path: root/tools/h5dump
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-12-02 20:32:22 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-12-02 20:32:22 (GMT)
commit624a4666003c8214be250d7153471fa593906f21 (patch)
tree45db39a2abbccd0f13b4f0a05bfe5318ccb98205 /tools/h5dump
parent5e695ce4bc577ddd9d490e6e6f079329985d827f (diff)
downloadhdf5-624a4666003c8214be250d7153471fa593906f21.zip
hdf5-624a4666003c8214be250d7153471fa593906f21.tar.gz
hdf5-624a4666003c8214be250d7153471fa593906f21.tar.bz2
[svn-r24482] HDFFV-8635: remove test of whole file and just test dsets that have szip compression.
Tested local linux with cmake and autotools
Diffstat (limited to 'tools/h5dump')
-rw-r--r--tools/h5dump/CMakeTests.cmake3
-rw-r--r--tools/h5dump/errfiles/treadfilter.err59
-rw-r--r--tools/h5dump/testh5dump.sh.in10
3 files changed, 5 insertions, 67 deletions
diff --git a/tools/h5dump/CMakeTests.cmake b/tools/h5dump/CMakeTests.cmake
index 9626183..13c3d41 100644
--- a/tools/h5dump/CMakeTests.cmake
+++ b/tools/h5dump/CMakeTests.cmake
@@ -303,7 +303,6 @@
${PROJECT_SOURCE_DIR}/errfiles/torderlinks2.err
${PROJECT_SOURCE_DIR}/errfiles/tgroup-2.err
${PROJECT_SOURCE_DIR}/errfiles/tperror.err
- ${PROJECT_SOURCE_DIR}/errfiles/treadfilter.err
${PROJECT_SOURCE_DIR}/errfiles/tslink-D.err
)
@@ -1356,7 +1355,7 @@
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_H5ERR_MASK_TEST (treadfilter 1 --enable-error-stack tfilters.h5)
+ 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)
diff --git a/tools/h5dump/errfiles/treadfilter.err b/tools/h5dump/errfiles/treadfilter.err
deleted file mode 100644
index 9f3fe31..0000000
--- a/tools/h5dump/errfiles/treadfilter.err
+++ /dev/null
@@ -1,59 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
- #000: (file name) line (number) in H5Dread(): can't read data
- major: Dataset
- minor: Read failed
- #001: (file name) line (number) in H5D__read(): can't read data
- major: Dataset
- minor: Read failed
- #002: (file name) line (number) in H5D__contig_read(): contiguous read failed
- major: Dataset
- minor: Read failed
- #003: (file name) line (number) in H5D__select_read(): read error
- major: Dataspace
- minor: Read failed
- #004: (file name) line (number) in H5D__select_io(): read error
- major: Dataspace
- minor: Read failed
- #005: (file name) line (number) in H5D__efl_readvv(): can't perform vectorized EFL read
- major: Dataset
- minor: Can't operate on object
- #006: (file name) line (number) in H5V_opvv(): can't perform operation
- major: Internal error (too specific to document in detail)
- minor: Can't operate on object
- #007: (file name) line (number) in H5D__efl_readvv_cb(): EFL read failed
- major: Dataset
- minor: Read failed
- #008: (file name) line (number) in H5D__efl_read(): unable to open external raw data file
- major: External file list
- minor: Unable to open file
-h5dump error: unable to print data
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
- #000: (file name) line (number) in H5Dread(): can't read data
- major: Dataset
- minor: Read failed
- #001: (file name) line (number) in H5D__read(): can't read data
- major: Dataset
- minor: Read failed
- #002: (file name) line (number) in H5D__chunk_read(): unable to read raw data chunk
- major: Low-level I/O
- minor: Read failed
- #003: (file name) line (number) in H5D__chunk_lock(): data pipeline read failed
- major: Data filters
- minor: Filter operation failed
- #004: (file name) line (number) in H5Z_pipeline(): required filter 'myfilter' is not registered
- major: Data filters
- minor: Read failed
- #005: (file name) line (number) in H5PL_load(): search in paths failed
- major: Plugin for dynamically loaded library
- minor: Can't get value
- #006: (file name) line (number) in H5PL__find(): can't open directory
- major: Plugin for dynamically loaded library
- minor: Can't open directory or file
-h5dump error: unable to print data
-H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
- #000: (file name) line (number) in h5tools_dump_simple_dset(): H5Dread failed
- major: Failure in tools library
- minor: error in function
- #001: (file name) line (number) in h5tools_dump_simple_dset(): H5Dread failed
- major: Failure in tools library
- minor: error in function
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index 3f5ef52..0c72a8d 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -372,7 +372,6 @@ ${SRC_H5DUMP_ERRORFILES}/tgroup-2.err
${SRC_H5DUMP_ERRORFILES}/torderlinks1.err
${SRC_H5DUMP_ERRORFILES}/torderlinks2.err
${SRC_H5DUMP_ERRORFILES}/tperror.err
-${SRC_H5DUMP_ERRORFILES}/treadfilter.err
${SRC_H5DUMP_ERRORFILES}/tqmarkfile.err
${SRC_H5DUMP_ERRORFILES}/tslink-D.err
"
@@ -1188,11 +1187,10 @@ 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
-# HDFFV-8635 - disable test
-# if test $USE_FILTER_SZIP = "yes"; then
-# # data read
-# TOOLTEST4 treadfilter.ddl --enable-error-stack tfilters.h5
-# fi
+ 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