Commit Graph

73 Commits

Author SHA1 Message Date
Allen Byrne
f514861864 HDFFV-8745 merge h5diff attribute fix 2018-01-11 09:13:05 -06:00
Allen Byrne
6d7133bf01 HDFFV-10297 merge from develop 2017-10-19 15:15:44 -05:00
Allen Byrne
c0d6729ab0 Add missing test file 2017-09-07 13:41:03 -05:00
Allen Byrne
a57f039a6a HDFFV-9774 Add enable-error-stack to h5diff 2017-09-06 11:00:36 -05:00
Allen Byrne
dd51a8c0ad HDFFV-10246 Fix vl string compare 2017-07-26 09:54:24 -05:00
Allen Byrne
1c49299374 HDFFV-9055 Correct file generation 2017-05-18 16:46:13 -05:00
Allen Byrne
ef31a9409b HDFFV-9055 add new test file 2017-05-17 16:21:02 -05:00
Allen Byrne
a466f16851 Tools merge from develop-1.10 2017-05-17 15:53:42 -05:00
Allen Byrne
e9ed615753 HDFFV-10128 test reference files 2017-03-06 13:36:41 -06:00
Allen Byrne
0c25a705ba HDFFV-10128 merge from develop 2017-03-06 13:32:42 -06:00
Allen Byrne
bbaf080956 HDFFV-10118 correct dataset name 2017-01-20 16:27:06 -06:00
Allen Byrne
363c5e67a5 HDFFV-10118 port plugin tools test fix to 1.8 2017-01-20 15:49:43 -06:00
Allen Byrne
35f0e16e34 HDFFV-9994 port changes from develop.
CMake folder changes brought up to standard.
2017-01-18 14:05:25 -06:00
Dana Robinson
c5815755cc [svn-r25111] Changed Subeversion EOL and executable properties. No code changes. 2014-04-25 15:58:01 -05:00
Albert Cheng
7031b03ac8 [svn-r25082] Bug HDFFV-8625, HDFFV-8639, HDFFV-8745:
h5diff issues "unable to read attribute" error message when comparing
    two files

Description:
    h5diff did not handle attributes of variable length strings
    correctly. It created the wrong memory type if one but not both
    compared attributes are of the variable strings type. It ended in
    H5Aread() failure.

Solution:
    We decided to treat the case when one type is variable length string
    and the other is not as incomparable. That bypassed the above error.
    We still need to figure out the proper way, if possible, to compare
    variable string with non-variable string types.

Tested: h5committested plus tested in Swallow (OS X 10.8).
2014-04-22 17:30:38 -05:00
Jonathan Kim
6bf2f2482e [svn-r23309] Purpose:
HDFFV-7643 - h5diff - incorrect exit-code returns for extra attribute exist

Description:
   h5diff: Fixed to return correct exit code 1 when detect unique
   attribute. Prior to this fix, h5diff returned exit code 0 indicating 
   two files are identical.
   Merged from HDF5 trunk r23304.

Tested: 
    jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), fred (mac64-LE), emu (solaris-BE),  Windows (32-LE cmake), cmake (jam)
2013-02-21 14:23:53 -05:00
Jonathan Kim
0c21f00cf8 [svn-r22753] Purpose:
HDFFV-5919 -  GMQS: h5diff - The number of object difference is not consistent between dataset and group/type when attribute(s) have differences

Description:
  Object differences are not consistent between dataset and group/datatype when their attribute(s) have differences. This is because attribute(s) differences is not accumulated to group or datatype object’s difference, but accumulated to dataset difference.
  To fix, do not accumulate attribute difference to dataset difference.  This is referred to h5diff’s default behavior and also past report from users that users were confused by the accumulated behavior. (also can’t figure out only for dataset difference , also hard to spot dataset difference when it has lots of attributes or differences)
  This also lead to fix inconsistent format indicating difference between dataset and group/datatype object.
  Merged from HDF5 trunk r22751. 

Tested: 
    jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE),  Windows (32-LE cmake), cmake (jam)
2012-09-11 18:19:53 -05:00
Jonathan Kim
dc7748afb9 [svn-r22701] Purpose:
Address HDFFV-7942 - h5diff: incorrect result for comparing attribute data with different type size in same class

Description:
   When comparing attribute data values with same type class but different size, the result was incorrect.  It was due to the size difference and got truncated. 
   Fixed to match up the smaller type size to big type size like what dataset does.
   Merged from HDF5 trunk r22684 and r22691.

  
Tested: 
 jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), Windows (32-LE cmake), cmake (jam)
2012-08-20 15:11:58 -05:00
Jonathan Kim
c631d9e87a [svn-r22320] Purpose:
Fix for HDFFV-7998-h5diff: incorrect behavior and output for comparing symbolic dangling links without following-symlinks option 

Description:
  Fix not to check and display dangling link status without --follow-symlinks option.
  Berfor the fix, when comparing symbolic link to symbolic link without follow-symlinks option, h5diff followed to check if those links are dangling or not. It caused to display output incorrectly (dangling link instead of symbolic link).
  
  The fix also improved performance when comparing lots of symbolic links without the --follow-symlinks option.
  Test cases were added and tagged with jira#.
  This merged from HDF5 trunk r22319.

Tested:
  jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE),  Windows (32-LE cmake), cmake (jam)
2012-04-27 10:50:50 -05:00
Jonathan Kim
646374e701 [svn-r22188] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects

Description:
  Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
  Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
  Test cases were added and tagged with jira#.
  Merged from HDF5 trunk 22176.

Tested:
  jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Cmake (jam)
2012-03-29 11:57:01 -05:00
Dana Robinson
35a903680e [svn-r22148] Removed incorrect executable svn properties from text, source, in, and HDF5 files. 2012-03-26 15:12:51 -05:00
Jonathan Kim
b462f48e9b [svn-r22124] Purpose:
Fix for HDFFV-7837 - h5diff: incorrect behavior with exclude-path option when unique object exist only in one file

Description:
  If unique objects exists only in one file and try to exclude
  the unique objects with --exclude-path option, h5diff missed 
  excluding some objects. 
  Fixed to exclude objects correctly in such case.
  Test cases were added and tagged with jira#.
  Merged from HDF5 trunk r22114.


Tested:
  jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE),  Windows (32-LE cmake), Cmake (jam)
2012-03-22 14:35:41 -05:00
Jonathan Kim
493e1e8f80 [svn-r22057] Purpose:
Fix for HDFFV-7835 h5diff: incorrect result for comparing the two same type symlinks as dangling links.

Description:
  When two symbolic dangling links are compared with --follow-symlinks option,
  the result should be same. It works for comparing two files, but didn't work
  for comparing two objects. 
  Test cases were added and tagged with jira#.
  Merged from HDF5 trunk r22038.

Tested:
  jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE),  Windows (32-LE cmake), Cmake (jam)
2012-03-12 17:49:17 -05:00
Jonathan Kim
2558bfc562 [svn-r21892] Purpose:
Fix for HDFFV-7836 h5diff: displays error stack message for comparing the two dangling symlink with follow-symlinks option

Description:
  While ago, to improve performance, skipping same object checking 
  (h5tools_is_obj_same()) was added. 
  However the checking function doesn't understand about the dangling link and
  caused the issue. 
  Since handling dangling link code section already implemented, move the 
  checking function after handling dangling-links to address the problem.
  Test was added and tagged with jira#.

Tested:
  jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE),  Windows (32-LE cmake), Cmake (jam)
2012-01-25 16:12:15 -05:00
Jonathan Kim
1fde26b7a5 [svn-r21660] Purpose:
HDFFV-7770 - h5diff segmentation fault on JPSS files

Description:
    Fixed segfault over non-comparable attribute with different dimention or
    rank, along with '-c' option to display details.
    Merged from HDF5 trunk r21658.

Tested:
 jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows, Cmake
2011-10-24 17:24:20 -05:00
Jonathan Kim
8f8fb620d8 [svn-r21404] Purpose:
HDFFV-7693 - h5diff produces different behavior between versions: 1.8.3 and 1.8.6

Description: 
    There were two issues on this. 
    One was not displaying all the comparable objects if non-comparable 
    object/attribute exist and compared before comparables ones. This issue
    occurred after 1.8.4 release. This is the issue from user.
    The other issue was not displaying all the comparable attributes, 
    if non-comparable object/attribute exist and compared ahead. This issue 
    were exist even before 1.8.4 release. So it's possible some attribute 
    comparison may have not displayed correctly in the past, if non-comparable 
    data were exist in common object.
    Fixed h5diff to display all the comparable object and attribute regardless 
    of non-comparables. 

    Merged from HDF5 trunk r21396 and r21397.

Tested:
 jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Cmake (jam, Windows)
2011-09-21 10:20:20 -05:00
Jonathan Kim
36ea4e8553 [svn-r21368] Purpose:
HDFFV-7712 - h5diff: segfault over combinations of complex container types (compound, array, vlen)

Description:
    - Fixed segfault over dataset with container types (array,lven) with multiple nested compound types. (ex: compound->array->compound, compound->vlen->compound)
    - Merged from HDF5 trunk r21358.

Tested:
    jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Cmake (jam)
2011-09-06 15:26:08 -05:00
Jonathan Kim
caad58c541 [svn-r21239] Description:
Merged from HDF5 trunk r21237.
  Add test cases for HDFFV-7656 - "--delta=something" considers two NaN of the same type are different.
  The fix was added (r21105) before but test cases were incorrectly added and missing for cmake script.

Tested:
  jam (linux32-LE), koala (linux64-LE), tejeda (mac32-LE), cmake (jam)
2011-08-17 11:06:32 -05:00
Jonathan Kim
0069b4b190 [svn-r21151] Description:
Merged from HDF5 trunk r21105

  Fixed two bugs:    
    - h5repack: h5repack failed to copy dataset if the layout is changed from c
      hunked with unlimited dims to contiguous. (PC -- 2011/07/15)
    - h5diff: "--delta" option considers two NaN of the same type are different
      , which is wrong based on http://www.hdfgroup.org/HDF5/doc/RM/Tools.html#Tools-Diff.  (PC -- 2011/07/15)

Tested:
  jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE)
2011-07-26 10:20:51 -05:00
Jonathan Kim
a3bf96ec3c [svn-r21077] Purpose:
Work for HDFFV-7600 - GMQS: h5diff - argument options -d, -p and --use-system-epsilon should be mutually exclusive.

Description:
    Merge from HDF5 trunk r21072.
    Fixed h5diff to display instructive error message and exit with 1
    when mutually exclusive options (-d, -p and --use-system-epsilon)
    are used together.

Tested:
    jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Cmake (jam)
2011-07-08 10:53:10 -05:00
Dana Robinson
acf8608ce6 [svn-r20789] Merged 20724 and 20756 from the trunk to fix HDFFV-7527 concerning
invalid enum value comparisons.

Tested on: h5committest
2011-05-10 11:11:11 -05:00
Jonathan Kim
3e755a079b [svn-r20706] Purpose:
- HDFFV-5928 - GMQS: h5diff problem and improvement on comparsing the same objects

Description:
    Merged from HDF5 trunk r20676.
    Fixed:
    1) adding h5tools_is_obj_same() function to check if two given IDs or paths point to the same object. This function can be very useful for other tools and applications.
    2) using h5tools_is_obj_same() at h5diff() and diff() in h5diff.c. If two paths point to the same object, there is no need to check the details of the object since we know there is no difference. The fix will increase the performance by skipping the content comparison. It also fixed the problem of reporting difference for some cases of comparing the same file, e.g. empty files or files with incomparable objects the same file.

    Test update:
    Updat prvious test cases (171, 172, 530) affected by this fix, so they
    still perfrom originally intended testing without bypassing.

Tested:
 jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), cmake
2011-05-02 15:41:03 -05:00
Raymond Lu
d6f1109839 [svn-r20582] Bug 1386 - allowing dimension size to be zero. I forgot to check in these 2 data files for the test.
Now test is needed.
2011-04-20 16:43:40 -05:00
Raymond Lu
4d0fbe96bc [svn-r20579] Bug 1386 - allowing dimension size to be zero. I added test cases in the tests for h5dump and h5diff. I also added the
test cases in the CMAKE script.

Tested on jam.  But I tested the same change in the trunk with h5committest.
2011-04-20 16:34:49 -05:00
Jonathan Kim
28145179bd [svn-r20428] Purpose:
Fixed Bug 2184 - GMQS: h5diff - incorrect calculation code for 
    --use-system-epsilon option

Description:
    Additional check in from the previous checkin r20425.
    Updated help page again.
     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE)
2011-04-06 16:05:55 -05:00
Jonathan Kim
81dce5bdfe [svn-r20425] Purpose:
Fixed Bug 2184 - GMQS: h5diff - incorrect calculation code for 
    --use-system-epsilon option

Description:
    Additional check in from the previous checkin r20369.
    Updated help page.
     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE)
2011-04-06 14:59:21 -05:00
Jonathan Kim
d467c2ce71 [svn-r20369] Purpose:
Fixed Bug 2184 - GMQS: h5diff - incorrect calculation code for 
    --use-system-epsilon option

Description:
    Fixed h5diff for --use-system-epsilon option: the calculation changed
    from ( |a - b| / b ) to ( |a - b| ). This was decided for better 
    performance and was corrected only in HDF5 trunk, so 1.8 got updated.
    Also comments for equal_XXX() function were updated correctly. 
    Also help page and RM got updated correctly.
    Also add test cases for testing the differences w/wo the option.

     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE)
2011-03-29 11:20:19 -05:00
Jonathan Kim
bf558b6fbf [svn-r20350] Purpose:
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 r20334.
    This is related to previous checkin r20299.
    Add help page update for verbose option level feature, which displays 
    useful information about attribute difference with -v1, --verbose=1 -v2 
    or --verbose=2 option.

     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE)
2011-03-25 16:47:31 -05:00
Jonathan Kim
2aabc3f415 [svn-r20299] Purpose:
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)
2011-03-23 09:37:45 -05:00
Jonathan Kim
ab0ad9ff02 [svn-r19893] Purpose:
Bug 2089 - GMQS: h5diff segfault on a compound dataset with fixed length + 
    vlen string type order

Description:
    Merged from HDF5 trunk r19892.
    This is fix for the segfault when h5diff compares a compound dataset with 
    combination of fixed length string types and vlen string types in certain 
    orders. Optimized vlariable length string handling codes. The fix is 
    referred from h5dump handling vlen strings. 
    For testing, several compound datasets were added with various combinations.
    Previous failed cases:
     - Vlen string, Fixed length string, Vlen string, Fixed length string
     - Fixed length string, Fixed length string, Vlen string, Vlen string
     - Fixed length string, Vlen string, Fixed length string, Vlen string
     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), linew (solaris-BE)
2010-12-28 14:36:30 -05:00
Jonathan Kim
13c16c8982 [svn-r19713] Purpose:
Fixed h5diff to handle variable-length strings in a compound dataset 
    correctly. Also variable-length string array in a compound dataset.
    Bug #1989.
    

Description:
    Garbage values were displayed when h5diff compared variable-length 
    strings (or string array) in a compound type dataset. 
    Merged from hdf5 trunk r19712.


Tested:
 jam (linux32-LE), heiwa (linuxppc64-BE)
2010-11-02 11:57:16 -05:00
Jonathan Kim
c88c65c130 [svn-r19492] Purpose:
Update help page for exclude-path feature.

Description:
 Merged from hdf5 trunk (r19491).
 Related to "1890:  h5diff excluding object for file comparison via command line" checkins. (r19406)

Tested:
 jam, linew
2010-09-29 10:45:11 -05:00
Jonathan Kim
322a384b13 [svn-r19444] Purpose:
Fix for group comparison with exclude-path case. Use relative path.

Description:
 Merge from hdf5 trunk (r19443)
 Related to "1890:  h5diff excluding object for file comparison via command line" checkins. (r19407)

Tested:
 jam, amani
2010-09-20 17:20:13 -05:00
Jonathan Kim
3bfb10b2fc [svn-r19411] Purpose:
Add extra test cases for Bug1975 h5diff - support recursive comparison on group when specified as an object

Description:
 Merged from hdf5 trunk (r19409)
 Additional tests for combination of group recursive and --follow-symlinks 
 with multi-linked external links with several files (same name/strucure).

Tested:
 jam, amani, heiwa
2010-09-16 19:22:29 -05:00
Jonathan Kim
6d97ffcc6c [svn-r19407] Purpose:
Add --exclude-path option

Description:
 Merged from hdf5 trunk (r19406).
 Specified path to an object will be excluded from comparing the two files or two groups. If group is specified all the member objects will be excluded.
Related to "1890:  h5diff excluding object for file comparison via command line"

Tested:
 jam, amani
2010-09-16 16:57:27 -05:00
Jonathan Kim
a9a3f22e78 [svn-r19401] Purpose:
Fix for Bug1975 h5diff - support recursive comparison on group when specified as an object

Description:
 Merged from hdf5 trunk (r19400).
 Compare member objects and groups recursively when two files or groups are specified to be compared. Support parallel diff and handling symbolic links accordingly.

Tested:
 jam, amani
2010-09-16 13:09:59 -05:00
Jonathan Kim
6cd165398b [svn-r18874] Purpose:
Rename '--follow-links' to '--follow-symlinks' 

Description:
    The '--follow-links' option is to follow symbolic links (soft and external).
    Make the name more intuitive and specific to the feature.
    Merged from hdf5 trunk r18873.

Tested:
    jam
2010-05-21 15:31:03 -05:00
Allen Byrne
84103cef85 [svn-r18773] Add files to support building library with CMake
Tested: Local linux
2010-05-12 13:51:33 -05:00
Allen Byrne
2aaa6b7dd9 [svn-r18318] Updated test script to match *nix shell script. Also corrected 629 file exit code
Tested: windows
2010-02-23 14:02:54 -05:00
Jonathan Kim
52d87caef3 [svn-r18279] Purpose:
Work for bugzilla 1754: h5diff: support comparing through links.

Description:
    merged from hdf5 trunk (18164, 18165, 18166, 18167, 18170, 18266, 18273)

Tested:
    h5committest (jam, amani and linew)
2010-02-18 21:39:22 -05:00