mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

HDFFV-9745 Create test and files to verify fixes

Browse Source
This commit is contained in:
Allen Byrne 2018-01-04 10:09:03 -06:00
parent f8e84c5509
commit 7d13e53294
9 changed files with 3715 additions and 3105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MANIFEST
View File

@ -2382,6 +2382,7 @@
./tools/test/h5diff/testfiles/h5diff_attr1.h5
./tools/test/h5diff/testfiles/h5diff_attr2.h5
./tools/test/h5diff/testfiles/h5diff_attr3.h5
./tools/test/h5diff/testfiles/h5diff_attr_v_level1.h5
./tools/test/h5diff/testfiles/h5diff_attr_v_level2.h5
./tools/test/h5diff/testfiles/h5diff_basic1.h5
@ -2423,10 +2424,8 @@
./tools/test/h5diff/testfiles/compounds_array_vlen2.h5
./tools/test/h5diff/testfiles/non_comparables1.h5
./tools/test/h5diff/testfiles/non_comparables2.h5
./tools/test/h5diff/testfiles/tmpSingleSiteBethe.reference.h5
./tools/test/h5diff/testfiles/h5diff_8625.txt
./tools/test/h5diff/testfiles/h5diff_tmp2.txt
./tools/test/h5diff/testfiles/tmpSingleSiteBethe.output.h5
./tools/test/h5diff/testfiles/h5diff_8639.txt
./tools/test/h5diff/testfiles/tudfilter.h5
./tools/test/h5diff/testfiles/tudfilter2.h5
./tools/test/h5diff/testfiles/h5diff_ud.txt

11
tools/test/h5diff/CMakeTests.cmake
View File

@ -26,6 +26,7 @@
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dtypes.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr1.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr2.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr3.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset1.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset2.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset3.h5
@ -63,8 +64,6 @@
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/compounds_array_vlen2.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/non_comparables1.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/non_comparables2.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/tmpSingleSiteBethe.reference.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/tmpSingleSiteBethe.output.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/tudfilter.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/tudfilter2.h5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/diff_strings1.h5
@ -292,7 +291,7 @@
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_801.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_90.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8625.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_tmp2.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8639.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ud.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_udfail.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v1.txt
@ -1021,6 +1020,8 @@
h5diff_801.out.err
h5diff_8625.out
h5diff_8625.out.err
h5diff_8639.out
h5diff_8639.out.err
h5diff_90.out
h5diff_90.out.err
h5diff_v1.out
@ -1281,8 +1282,6 @@ ADD_H5_TEST (h5diff_631 0 -v --use-system-epsilon ${FILE1} ${FILE1} g1/fp18 g1/f
# 7. attributes
# ##############################################################################
ADD_H5_TEST (h5diff_70 1 -v ${FILE5} ${FILE6})
# temporary test to verify HDFFV-8639
ADD_H5_TEST (h5diff_tmp2 1 tmpSingleSiteBethe.output.h5 tmpSingleSiteBethe.reference.h5)
# ##################################################
# attrs with verbose option level
@ -1614,6 +1613,8 @@ ADD_H5_TEST (h5diff_487 1 -v --exclude-path "/group1/dset" h5diff_exclude3-1.h5
ADD_H5_TEST (h5diff_530 0 -v ${COMP_VL_STRS_FILE} ${COMP_VL_STRS_FILE} /group /group_copy)
# test to verify HDFFV-8625
ADD_H5_TEST (h5diff_8625 0 -v --enable-error-stack ${COMP_VL_STRS_FILE} ${COMP_VL_STRS_FILE} /group/Compound_dset1 /group_copy/Compound_dset3)
# test to verify HDFFV-8639
ADD_H5_TEST (h5diff_8639 0 -v h5diff_attr3.h5 h5diff_attr2.h5 /g1)
ADD_H5_TEST (h5diff_vlstr 0 -v tvlstr.h5 tvlstr2.h5)
# ##############################################################################

6710
tools/test/h5diff/h5diffgentest.c
View File

File diff suppressed because it is too large Load Diff

72
tools/test/h5diff/testfiles/h5diff_8639.txt Normal file
View File

@ -0,0 +1,72 @@
group1 group2
---------------------------------------
x x
group : </g1> and </g1>
0 differences found
Warning: different storage datatype
Not comparable: <VLstring> or <VLstring> is of mixed string type
Warning: different storage datatype
Not comparable: <VLstring2D> or <VLstring2D> is of mixed string type
Warning: different storage datatype
Not comparable: <VLstring3D> or <VLstring3D> is of mixed string type
attribute: <array of </g1>> and <array of </g1>>
0 differences found
attribute: <array2D of </g1>> and <array2D of </g1>>
0 differences found
attribute: <array3D of </g1>> and <array3D of </g1>>
0 differences found
attribute: <bitfield of </g1>> and <bitfield of </g1>>
0 differences found
attribute: <bitfield2D of </g1>> and <bitfield2D of </g1>>
0 differences found
attribute: <bitfield3D of </g1>> and <bitfield3D of </g1>>
0 differences found
attribute: <compound of </g1>> and <compound of </g1>>
0 differences found
attribute: <compound2D of </g1>> and <compound2D of </g1>>
0 differences found
attribute: <compound3D of </g1>> and <compound3D of </g1>>
0 differences found
attribute: <enum of </g1>> and <enum of </g1>>
0 differences found
attribute: <enum2D of </g1>> and <enum2D of </g1>>
0 differences found
attribute: <enum3D of </g1>> and <enum3D of </g1>>
0 differences found
attribute: <float of </g1>> and <float of </g1>>
0 differences found
attribute: <float2D of </g1>> and <float2D of </g1>>
0 differences found
attribute: <float3D of </g1>> and <float3D of </g1>>
0 differences found
attribute: <integer of </g1>> and <integer of </g1>>
0 differences found
attribute: <integer2D of </g1>> and <integer2D of </g1>>
0 differences found
attribute: <integer3D of </g1>> and <integer3D of </g1>>
0 differences found
attribute: <opaque of </g1>> and <opaque of </g1>>
0 differences found
attribute: <opaque2D of </g1>> and <opaque2D of </g1>>
0 differences found
attribute: <opaque3D of </g1>> and <opaque3D of </g1>>
0 differences found
Warning: different storage datatype
Not comparable: <string> or <string> is of mixed string type
Warning: different storage datatype
Not comparable: <string2D> or <string2D> is of mixed string type
Warning: different storage datatype
Not comparable: <string3D> or <string3D> is of mixed string type
attribute: <vlen of </g1>> and <vlen of </g1>>
0 differences found
attribute: <vlen2D of </g1>> and <vlen2D of </g1>>
0 differences found
attribute: <vlen3D of </g1>> and <vlen3D of </g1>>
0 differences found
--------------------------------
Some objects are not comparable
--------------------------------
Use -c for a list of objects without details of differences.
EXIT CODE: 0

BIN
tools/test/h5diff/testfiles/h5diff_attr1.h5
View File

Binary file not shown.

BIN
tools/test/h5diff/testfiles/h5diff_attr2.h5
View File

Binary file not shown.

BIN
tools/test/h5diff/testfiles/h5diff_attr3.h5 Normal file
View File

Binary file not shown.

13
tools/test/h5diff/testfiles/h5diff_tmp2.txt
View File

@ -1,13 +0,0 @@
dataset: </G/down/Data> and </G/down/Data>
1599 differences found
dataset: </G/down/Tail/array> and </G/down/Tail/array>
8 differences found
dataset: </G/up/Data> and </G/up/Data>
1845 differences found
dataset: </G/up/Tail/array> and </G/up/Tail/array>
10 differences found
--------------------------------
Some objects are not comparable
--------------------------------
Use -c for a list of objects.
EXIT CODE: 1

9
tools/test/h5diff/testh5diff.sh.in
View File

@ -82,6 +82,7 @@ $SRC_H5DIFF_TESTFILES/h5diff_types.h5
$SRC_H5DIFF_TESTFILES/h5diff_dtypes.h5
$SRC_H5DIFF_TESTFILES/h5diff_attr1.h5
$SRC_H5DIFF_TESTFILES/h5diff_attr2.h5
$SRC_H5DIFF_TESTFILES/h5diff_attr3.h5
$SRC_H5DIFF_TESTFILES/h5diff_dset1.h5
$SRC_H5DIFF_TESTFILES/h5diff_dset2.h5
$SRC_H5DIFF_TESTFILES/h5diff_hyper1.h5
@ -118,8 +119,6 @@ $SRC_H5DIFF_TESTFILES/h5diff_attr_v_level2.h5
$SRC_H5DIFF_TESTFILES/h5diff_enum_invalid_values.h5
$SRC_H5DIFF_TESTFILES/non_comparables1.h5
$SRC_H5DIFF_TESTFILES/non_comparables2.h5
$SRC_H5DIFF_TESTFILES/tmpSingleSiteBethe.reference.h5
$SRC_H5DIFF_TESTFILES/tmpSingleSiteBethe.output.h5
$SRC_H5DIFF_TESTFILES/diff_strings1.h5
$SRC_H5DIFF_TESTFILES/diff_strings2.h5
$SRC_TOOLS_TESTFILES/tvlstr.h5
@ -336,7 +335,7 @@ $SRC_H5DIFF_TESTFILES/h5diff_710.txt
$SRC_H5DIFF_TESTFILES/h5diff_80.txt
$SRC_H5DIFF_TESTFILES/h5diff_90.txt
$SRC_H5DIFF_TESTFILES/h5diff_8625.txt
$SRC_H5DIFF_TESTFILES/h5diff_tmp2.txt
$SRC_H5DIFF_TESTFILES/h5diff_8639.txt
$SRC_H5DIFF_TESTFILES/h5diff_v1.txt
$SRC_H5DIFF_TESTFILES/h5diff_v2.txt
$SRC_H5DIFF_TESTFILES/h5diff_v3.txt
@ -818,8 +817,6 @@ TOOLTEST h5diff_631.txt -v --use-system-epsilon h5diff_basic1.h5 h5diff_basic1.h
# 7. attributes
# ##############################################################################
TOOLTEST h5diff_70.txt -v h5diff_attr1.h5 h5diff_attr2.h5
# temporary test to verify HDFFV-8639
TOOLTEST h5diff_tmp2.txt tmpSingleSiteBethe.output.h5 tmpSingleSiteBethe.reference.h5
# ##################################################
# attrs with verbose option level
@ -1143,6 +1140,8 @@ TOOLTEST h5diff_487.txt -v --exclude-path "/group1/dset" h5diff_exclude3-1.h5 h5
TOOLTEST h5diff_530.txt -v h5diff_comp_vl_strs.h5 h5diff_comp_vl_strs.h5 /group /group_copy
# test to verify HDFFV-8625
TOOLTEST h5diff_8625.txt -v --enable-error-stack h5diff_comp_vl_strs.h5 h5diff_comp_vl_strs.h5 /group/Compound_dset1 /group_copy/Compound_dset3
# test to verify HDFFV-8639
TOOLTEST h5diff_8639.txt -v h5diff_attr3.h5 h5diff_attr2.h5 /g1
TOOLTEST h5diff_vlstr.txt -v tvlstr.h5 tvlstr2.h5
# ##############################################################################