Commit Graph

59 Commits

Author SHA1 Message Date
Allen Byrne
ad4154cdc8 [svn-r26700] Generators are only built static
Plugin test for disable state does not print error stack and does not print FAILED
2015-04-01 16:04:06 -05:00
Allen Byrne
7ebd4c8311 [svn-r26600] Fix CMake target calls to add new parameter 2015-03-26 08:51:01 -05:00
Allen Byrne
ece0ba0336 [svn-r26371] Update cmake mininum version
Update windows wix cpack process.
2015-03-05 11:48:32 -05:00
Dana Robinson
c5815755cc [svn-r25111] Changed Subeversion EOL and executable properties. No code changes. 2014-04-25 15:58:01 -05:00
Allen Byrne
d9020f2e35 [svn-r24906] Merge latest CMake changes from trunk.
Tested: local linux
2014-03-26 10:00:35 -05:00
Allen Byrne
8194f34ef7 [svn-r24072] Merge trunk cmake changes to 1.8 branch.
Also add default switch blocks to h5import.
Merge h5dump any_path option from trunk.

Tested: local linux
2013-08-26 10:35:15 -05:00
Allen Byrne
e41f1a44b8 [svn-r23771] HDFFV-8434,-8437,-8445,-8447,-8461: Merge changes from Trunk.
Tested: local linux
2013-06-14 09:24:27 -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
Allen Byrne
1629fd1ee7 [svn-r23301] 2013-02-18 14:03:53 -05:00
Allen Byrne
13693b307c [svn-r23211] Merge trunk CMake changes for minimum cmake version of 2.8.10. This was prompted by HDFFV-8227, OS X requires latest version of cmake for proper support.
Tested: local linux
2013-01-31 12:30:34 -05:00
Allen Byrne
5336fb2d01 [svn-r22719] Fix RelWithDebInfo packaging
Tested: windows
2012-08-28 12:38:44 -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
Allen Byrne
17f1e60d93 [svn-r22475] Remove subfolder tools from install command 2012-06-19 11:41:48 -05:00
Allen Byrne
d857219181 [svn-r22451] Brought cmake configuration / configure changes from Trunk.
Tested jam, local linux
2012-06-11 11:12:49 -05:00
Jonathan Kim
7d93246d6f [svn-r22420] Purpose:
HDFFV-7602 - GMQS: HDF5 command tools: Provide framework for reusable test files among tools
  Stage2 working for h5diff tool.

Description:
  Update cmake script to fetch test files from any tools to a test directory
  and run test in organized manner. 
  Also keep the apperance similiar to shell script for better maintainance.
  
Tested:
  CMake (Windows and jam)
2012-05-30 15:27:56 -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
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
Allen Byrne
5ffbfdee1e [svn-r22043] HDFFV-7839: Dangling link should not display error
If a link is specified on the command with the -d option, call the handle_links function on error from the H5Dopen command. 
Updated test file results with error stack when link not found.

Tested: trunk
2012-03-12 12:23:29 -05:00
Allen Byrne
68d93b7f4e [svn-r22013] HDFFV-7560:
Merge 1.8 and h5dump/tools and tests based on tools library from trunk.
Reduced warnings.

HDFFV-7949:
Remove duplicated functions in h5ls

Tested: local linux,h5committest
2012-03-02 09:21:13 -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
Allen Byrne
6158a3128c [svn-r21805] Update CMake Required version in all folders to match current standard 2.8.6 2011-12-05 11:32:07 -05:00
Allen Byrne
141383fb26 [svn-r21717] Update cmake configuration
Update cmake to generate source folders in VS
Brought parallel changes from trunk

Tested: local linux
2011-11-04 13:45:41 -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
Allen Byrne
26f47610b1 [svn-r21337] Synchronize cmake files with tested commits from trunk, windows parallel diff 2011-08-30 11:51:32 -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
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
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
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
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
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
Allen Byrne
315392ce0a [svn-r20230] Change MEMCHECK condition for test result from if "1" to if NOT "0" to account for type "2" exit codes. 2011-03-11 09:15:54 -05:00
Allen Byrne
8b8637d014 [svn-r20199] Add expected fail condition to memcheck alternate tests. 2011-03-08 14:14:43 -05:00
Allen Byrne
76313da943 [svn-r20183] Add HDF5_USING_MEMCHECKER guards around script mode ADD_TEST. This will replace the list of ignore tests in CTestCustom.cmake file.
Bring back from trunk

Tested: local linux
2011-03-04 08:46:09 -05:00
Allen Byrne
7eb98436fc [svn-r20157] Bring CMake changes to branch up to r20156 from trunk 2011-02-25 09:33:50 -05:00
Allen Byrne
42388490d6 [svn-r20130] Add test dependencies to order tests
Tested: local linux
2011-02-21 16:08:12 -05:00
Allen Byrne
3771df0757 [svn-r19906] Windows: Correct how fortran links in CRT library. Also correct macro use for checking libtype.
Tested: Windows
2011-01-04 13:23:24 -05:00
Allen Byrne
8a7bf1ae4e [svn-r19898] Remove use of /MT compile flag for building static libs and programs. Added BUILT_AS_STATIC_LIBRARY define to set the windows import/export defines correctly for static libraries. 2010-12-30 09:03:15 -05:00
Allen Byrne
0ec9ac12ef [svn-r19793] Revised the valgrind ignore list, added simple execute command tests for when doing a valgrind test of tools that only use a cmake script for testing. 2010-11-16 13:40:21 -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
Allen Byrne
c18db616e5 [svn-r19528] Add clear generated objects commands to test blocks.
Add configurefile command to copy CTestCustom to build folder.

Bring r19527 back from trunk

Tested: local linux
2010-10-06 15:51:02 -05:00
Allen Byrne
694c9065e0 [svn-r19510] Improve CMake support for CYGWIN.
Correct script comment in testh5diff.sh

Bring r19509 back from trunk

Tested: Windows Cygwin
2010-10-04 16:41:03 -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
Allen Byrne
7c7b4e3deb [svn-r19438] Correct use of lib, include, bin in INSTALL commands to use proper variables.
Tested: local linux
2010-09-20 16:02:26 -05:00
Jonathan Kim
0407b2e64a [svn-r19416] Fix for Cmake test. Merged from hdf5 trunk (r19415). 2010-09-17 10:46:38 -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