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

[svn-r20299] Purpose:

Browse Source 
Fixed CHICAGO: Bug 2121 - h5diff - incorrect and lack of output for the 
    different set of attributes (different number and names)

Description:
    Merged from HDF5 trunk r20294
    Previously h5diff compared attributes correctly only when two objects have 
    the same number of attributes and attribute names are identical.
    Also didn't display useful information about attribute difference.
    This fix covers all other cases.
    This fixes both issues.

     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE)
This commit is contained in:
Jonathan Kim
2011-03-23 09:37:45 -05:00
parent 58ca19929f
commit 2aabc3f415
25 changed files with 10667 additions and 1324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tools/h5diff/testh5diff.sh
View File

@@ -71,6 +71,9 @@ EXCLUDE_FILE2_2=h5diff_exclude2-2.h5
# compound type with multiple vlen string types
COMP_VL_STRS_FILE=h5diff_comp_vl_strs.h5
ATTR_VERBOSE_LEVEL_FILE1=h5diff_attr_v_level1.h5
ATTR_VERBOSE_LEVEL_FILE2=h5diff_attr_v_level2.h5
TESTNAME=h5diff
EXIT_SUCCESS=0
EXIT_FAILURE=1
@@ -545,11 +548,42 @@ TOOLTEST h5diff_628.txt -n 1 $FILE1 $FILE2 g1/dset3 g1/dset4
# 6.29 non valid files
#TOOLTEST h5diff_629.txt file1.h6 file2.h6
# ##############################################################################
# 7. attributes
# ##############################################################################
TOOLTEST h5diff_70.txt -v $FILE5 $FILE6
# ##################################################
# attrs with verbose option level
# ##################################################
TOOLTEST h5diff_700.txt -v1 $FILE5 $FILE6
TOOLTEST h5diff_701.txt -v2 $FILE5 $FILE6
TOOLTEST h5diff_702.txt --verbose=1 $FILE5 $FILE6
TOOLTEST h5diff_703.txt --verbose=2 $FILE5 $FILE6
# same attr number , all same attr name
TOOLTEST h5diff_704.txt -v2 $ATTR_VERBOSE_LEVEL_FILE1 $ATTR_VERBOSE_LEVEL_FILE2 /g
# same attr number , some same attr name
TOOLTEST h5diff_705.txt -v2 $ATTR_VERBOSE_LEVEL_FILE1 $ATTR_VERBOSE_LEVEL_FILE2 /dset
# same attr number , all different attr name
TOOLTEST h5diff_706.txt -v2 $ATTR_VERBOSE_LEVEL_FILE1 $ATTR_VERBOSE_LEVEL_FILE2 /ntype
# different attr number , same attr name (intersected)
TOOLTEST h5diff_707.txt -v2 $ATTR_VERBOSE_LEVEL_FILE1 $ATTR_VERBOSE_LEVEL_FILE2 /g2
# different attr number , all different attr name
TOOLTEST h5diff_708.txt -v2 $ATTR_VERBOSE_LEVEL_FILE1 $ATTR_VERBOSE_LEVEL_FILE2 /g3
# when no attributes exist in both objects
TOOLTEST h5diff_709.txt -v2 $ATTR_VERBOSE_LEVEL_FILE1 $ATTR_VERBOSE_LEVEL_FILE2 /g4
# file vs file
TOOLTEST h5diff_710.txt -v2 $ATTR_VERBOSE_LEVEL_FILE1 $ATTR_VERBOSE_LEVEL_FILE2
# ##############################################################################
# 8. all dataset datatypes
# ##############################################################################