philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFFV-10980 - h5diff uses new ref APIs

Browse Source
This commit is contained in:
Allen Byrne
2019-12-19 16:29:35 -06:00
committed by David Young
parent b6b0567bdf
commit d486a9b27e
48 changed files with 1493 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,6 +94,17 @@
${HDF5_TOOLS_DIR}/testfiles/vds/5_vds.h5
# tools/testfiles
${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5
#STD_REF_OBJ files
${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_compat.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_ext1.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_ext2.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_grp.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_obj_del.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_obj.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_param.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1d.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5
)
set (LIST_OTHER_TEST_FILES
@@ -1044,7 +1055,10 @@ ADD_H5_TEST (h5diff_56 1 -v ${FILE4} ${FILE4} dset6a dset6b)
ADD_H5_TEST (h5diff_57 0 -v ${FILE4} ${FILE4} dset7a dset7b)
# 5.8 (region reference)
ADD_H5_TEST (h5diff_58 1 -v ${FILE7} ${FILE8} refreg)
ADD_H5_TEST (h5diff_58 1 -v2 ${FILE7} ${FILE8} refreg)
ADD_H5_TEST (h5diff_58_ref 1 -v2 ${FILE7} ${FILE8} /g1/reference2D)
# STD_REF_OBJ
ADD_H5_TEST (h5diff_reg 0 -v2 trefer_attr.h5 trefer_ext2.h5 Dataset3 Dataset3)
# test for both dset and attr with same type but with different size
# ( HDDFV-7942 )
@@ -1484,8 +1498,6 @@ ADD_H5_TEST (h5diff_485 0 -v --exclude-path "/group1" h5diff_exclude3-1.h5 h5dif
ADD_H5_TEST (h5diff_486 0 -v --exclude-path "/group1" h5diff_exclude3-2.h5 h5diff_exclude3-1.h5)
ADD_H5_TEST (h5diff_487 1 -v --exclude-path "/group1/dset" h5diff_exclude3-1.h5 h5diff_exclude3-2.h5)
# ##############################################################################
# # diff various multiple vlen and fixed strings in a compound type dataset
# ##############################################################################
@@ -1524,7 +1536,7 @@ ADD_H5_TEST (h5diff_800 1 -v ${FILE7} ${FILE8} /g1/array /g1/array)
ADD_H5_TEST (h5diff_801 1 -v ${FILE7} ${FILE8A} /g1/array /g1/array)
# ##############################################################################
# VDS tests
# # VDS tests
# ##############################################################################
ADD_H5_TEST (h5diff_v1 0 -v ${FILEV1} ${FILEV2})
ADD_H5_TEST (h5diff_v2 0 -r ${FILEV1} ${FILEV2})

4
tools/test/h5diff/testfiles/h5diff_58.txt
View File

@@ -1,3 +1,4 @@
dataset: </refreg> and </refreg>
Referenced dataset 10784 10784
------------------------------------------------------------
@@ -8,4 +9,7 @@ point #1 (2,2) (3,3)
point #3 (1,6) (2,5)
point #4 (2,8) (1,7)
4 differences found
obj1 obj2
--------------------------------------
Attributes status: 0 common, 0 only in obj1, 0 only in obj2
EXIT CODE: 1

37
tools/test/h5diff/testfiles/h5diff_58_ref.txt Normal file
View File

@@ -0,0 +1,37 @@
dataset: </g1/reference2D> and </g1/reference2D>
size: [2] [2]
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
size: [2] [2]
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
size: [2] [2]
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
size: [2] [2]
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
size: [2] [2]
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
size: [2] [2]
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
12 differences found
obj1 obj2
--------------------------------------
Attributes status: 0 common, 0 only in obj1, 0 only in obj2
EXIT CODE: 1

15
tools/test/h5diff/testfiles/h5diff_reg.txt Normal file
View File

@@ -0,0 +1,15 @@
dataset: </Dataset3> and </Dataset3>
attribute: <Attr1> and <Attr1>
0 differences found
Warning: Cannot open referenced attribute: attribute 1
Warning: Cannot open referenced attribute: attribute 2
attribute: <Attr2> and <Attr2>
0 differences found
attribute: <Attr3> and <Attr3>
0 differences found
0 differences found
obj1 obj2
--------------------------------------
Attributes status: 0 common, 0 only in obj1, 0 only in obj2
EXIT CODE: 0

33
tools/test/h5dump/CMakeTests.cmake
View File

@@ -198,6 +198,16 @@
${HDF5_TOOLS_DIR}/testfiles/h5dump-help.txt
${HDF5_TOOLS_DIR}/testfiles/out3.h5import
${HDF5_TOOLS_DIR}/testfiles/zerodim.ddl
#STD_REF_OBJ files
${HDF5_TOOLS_DIR}/testfiles/trefer_attrR.ddl
${HDF5_TOOLS_DIR}/testfiles/trefer_compatR.ddl
${HDF5_TOOLS_DIR}/testfiles/trefer_extR.ddl
${HDF5_TOOLS_DIR}/testfiles/trefer_grpR.ddl
${HDF5_TOOLS_DIR}/testfiles/trefer_obj_delR.ddl
${HDF5_TOOLS_DIR}/testfiles/trefer_objR.ddl
${HDF5_TOOLS_DIR}/testfiles/trefer_paramR.ddl
${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1dR.ddl
${HDF5_TOOLS_DIR}/testfiles/trefer_regR.ddl
)
set (HDF5_N_REFERENCE_FILES
tall-3
@@ -322,6 +332,18 @@
${HDF5_TOOLS_DIR}/testfiles/tvms.h5
${HDF5_TOOLS_DIR}/testfiles/t128bit_float.h5
${HDF5_TOOLS_DIR}/testfiles/zerodim.h5
#STD_REF_OBJ files
${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_compat.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_ext1.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_ext2.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_grp.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_obj_del.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_obj.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_param.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1d.h5
${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5
)
set (HDF5_ERROR_REFERENCE_TEST_FILES
${PROJECT_SOURCE_DIR}/errfiles/filter_fail.err
@@ -1108,6 +1130,17 @@
ADD_H5ERR_MASK_TEST (tattrregR 0 "NULL token size" -R --enable-error-stack tattrreg.h5)
ADD_H5_EXPORT_TEST (tbinregR tdatareg.h5 0 --enable-error-stack -d /Dataset1 -s 0 -R -y -o)
# test for 1.12 region references
ADD_H5_TEST (trefer_attrR 0 --enable-error-stack -R trefer_attr.h5)
ADD_H5_TEST (trefer_compatR 0 --enable-error-stack -R trefer_compat.h5)
ADD_H5_TEST (trefer_extR 0 --enable-error-stack -R trefer_ext2.h5)
ADD_H5_TEST (trefer_grpR 0 --enable-error-stack -R trefer_grp.h5)
ADD_H5_TEST (trefer_obj_delR 0 --enable-error-stack -R trefer_obj_del.h5)
ADD_H5_TEST (trefer_objR 0 --enable-error-stack -R trefer_obj.h5)
ADD_H5_TEST (trefer_paramR 0 --enable-error-stack -R trefer_param.h5)
ADD_H5_TEST (trefer_regR 0 --enable-error-stack -R trefer_reg.h5)
ADD_H5_TEST (trefer_reg_1dR 0 --enable-error-stack -R trefer_reg_1d.h5)
# tests for group creation order
# "1" tracked, "2" name, root tracked
ADD_H5_TEST (tordergr1 0 --enable-error-stack --group=1 --sort_by=creation_order --sort_order=ascending tordergr.h5)