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

Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into merge_func_enter_vol

Browse Source 
Plus initial steps toward merging API context push into FUNC_ENTER_API* macros
This commit is contained in:
Quincey Koziol
2018-03-18 18:36:49 -05:00
parent 4a17aff408 7aa4eb1b04
commit f38864920d
457 changed files with 26233 additions and 18888 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/test/h5diff/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.2.2)
cmake_minimum_required (VERSION 3.10)
PROJECT (HDF5_TOOLS_TEST_H5DIFF)
#-----------------------------------------------------------------------------
@@ -11,7 +11,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
# --------------------------------------------------------------------
if (HDF5_BUILD_GENERATORS)
add_executable (h5diffgentest ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/h5diffgentest.c)
TARGET_NAMING (h5diffgentest STATIC)
TARGET_C_PROPERTIES (h5diffgentest STATIC " " " ")
target_link_libraries (h5diffgentest ${HDF5_LIB_TARGET})
set_target_properties (h5diffgentest PROPERTIES FOLDER generator/tools)

23
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,10 +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/tmptest.he5
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/tmptest2.he5
${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
@@ -293,8 +290,8 @@
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_800.txt
${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_tmp1.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_tmp2.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8625.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 +1018,10 @@
h5diff_800.out.err
h5diff_801.out
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,10 +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 HDF5-8625
ADD_H5_TEST (h5diff_tmp1 0 tmptest2.he5 tmptest.he5)
# temporary test to verify HDF5-8639
ADD_H5_TEST (h5diff_tmp2 1 tmpSingleSiteBethe.output.h5 tmpSingleSiteBethe.reference.h5)
# ##################################################
# attrs with verbose option level
@@ -1613,7 +1610,11 @@ ADD_H5_TEST (h5diff_487 1 -v --exclude-path "/group1/dset" h5diff_exclude3-1.h5
# ##############################################################################
# # diff various multiple vlen and fixed strings in a compound type dataset
# ##############################################################################
ADD_H5_TEST (h5diff_530 0 -v ${COMP_VL_STRS_FILE} ${COMP_VL_STRS_FILE} /group /group_copy)
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)
# ##############################################################################

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

File diff suppressed because it is too large Load Diff

10
tools/test/h5diff/testfiles/h5diff_8625.txt Normal file
View File

@@ -0,0 +1,10 @@
dataset: </group/Compound_dset1> and </group_copy/Compound_dset3>
Warning: different storage datatype
Warning: different storage datatype
Not comparable: </group/Compound_dset1> or </group_copy/Compound_dset3> is of mixed string type
0 differences found
--------------------------------
Some objects are not comparable
--------------------------------
Use -c for a list of objects without details of differences.
EXIT CODE: 0

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.

5
tools/test/h5diff/testfiles/h5diff_tmp1.txt
View File

@@ -1,5 +0,0 @@
--------------------------------
Some objects are not comparable
--------------------------------
Use -c for a list of objects.
EXIT CODE: 0

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

BIN
tools/test/h5diff/testfiles/tmpSingleSiteBethe.output.h5
View File

Binary file not shown.

BIN
tools/test/h5diff/testfiles/tmpSingleSiteBethe.reference.h5
View File

Binary file not shown.

BIN
tools/test/h5diff/testfiles/tmptest.he5
View File

Binary file not shown.

BIN
tools/test/h5diff/testfiles/tmptest2.he5
View File

Binary file not shown.

17
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,10 +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/tmptest.he5
$SRC_H5DIFF_TESTFILES/tmptest2.he5
$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
@@ -337,8 +334,8 @@ $SRC_H5DIFF_TESTFILES/h5diff_709.txt
$SRC_H5DIFF_TESTFILES/h5diff_710.txt
$SRC_H5DIFF_TESTFILES/h5diff_80.txt
$SRC_H5DIFF_TESTFILES/h5diff_90.txt
$SRC_H5DIFF_TESTFILES/h5diff_tmp1.txt
$SRC_H5DIFF_TESTFILES/h5diff_tmp2.txt
$SRC_H5DIFF_TESTFILES/h5diff_8625.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
@@ -820,10 +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 HDF5-8625
TOOLTEST h5diff_tmp1.txt tmptest2.he5 tmptest.he5
# temporary test to verify HDF5-8639
TOOLTEST h5diff_tmp2.txt tmpSingleSiteBethe.output.h5 tmpSingleSiteBethe.reference.h5
# ##################################################
# attrs with verbose option level
@@ -1145,6 +1138,10 @@ TOOLTEST h5diff_487.txt -v --exclude-path "/group1/dset" h5diff_exclude3-1.h5 h5
# # diff various multiple vlen and fixed strings in a compound type dataset
# ##############################################################################
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
# ##############################################################################