Commit Graph

1921 Commits

Author SHA1 Message Date
Larry Knox
155b00d8ff [svn-r19506] Bring changes from revisions 19408, 19421, and 19442 from branches/hdf5_1_8 to trunk. These revisions reorganize the compile scripts using h5cc.in, h5fc.in, and h5c++.in, add checks for installed examples to the scripts that run them after installation, and add DESTDIR for install as needed for RPMs.
Tested on amani, heiwa and jam by h5committest and with CYGWIN.
2010-10-04 12:15:30 -05:00
Jonathan Kim
1733ea4780 [svn-r19491] Purpose:
Update help page for exclude-path feature.

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

Tested:
 jam, amani, heiwa
2010-09-29 10:12:23 -05:00
Raymond Lu
1c61b6fe13 [svn-r19481] I'm backing out my fix for bug 1707 because there're some unresolved issues - r19441 and 19467.
Bug 1707 is that H5Eset_auto causes a seg fault when an application uses -DH5_USE_16_API with 
the 1.8 library to compile.  

I created a branch off the trunk called set_auto to continue working on the problem.

Tested on jam - backing out, simple.
2010-09-27 14:02:48 -05:00
Raymond Lu
d6c6a34a8f [svn-r19457] Bug fix for 1707 - H5Eset_auto causes a seg fault when an application uses -DH5_USE_16_API with the 1.8 library to compile. The cause is from the mismatch of H5Eprint1 and H5Eprint2 set
through H5Eset_auto.  I changed the union in the structure H5E_auto_t.  Another change is to 
make H5Eget_auto fail if H5Eset_auto is called to set the printing function.  I'll write a 
document for it.

Tested on heiwa, jam, and amani.

The property change in configure.in, config, and Makefile.am came from the merge of the 1.8 
library change.
2010-09-21 11:46:38 -05:00
Jonathan Kim
04a7315138 [svn-r19443] Purpose:
Fix for group comparison with exclude-path case. Use relative path.

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

Tested:
 jam, amani and heiwa
2010-09-20 17:11:50 -05:00
Allen Byrne
b4be8ae3d5 [svn-r19434] Correct use of lib, include, bin in INSTALL commands to use proper variables.
Tested: local linux
2010-09-20 15:38:35 -05:00
Jonathan Kim
8c930b14df [svn-r19427] Updates for cmake tests from the h5diff group recursive updates. 2010-09-20 10:38:58 -05:00
Allen Byrne
8394d611f2 [svn-r19418] On windows, an include bypassed the WIN32_LEAN_AND_MEAN define. Moved the define up. Moved the h5dif.h to after the h5private include
Tested: Windows
2010-09-17 13:05:32 -05:00
Jonathan Kim
fad10086d2 [svn-r19415] Fix for Cmake test.
Tested:
 jam
2010-09-17 10:42:24 -05:00
Jonathan Kim
a11f905af8 [svn-r19410] Purpose:
Add missing files from the previous checkin.
 (Add extra test cases for Bug1975 h5diff - support recursive comparison on group when specified as an object)
2010-09-16 19:14:04 -05:00
Jonathan Kim
a436e41203 [svn-r19409] Purpose:
Add extra test cases for bug1975 h5diff - support recursive comparison on group when specified as an object.

Description:
 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 18:58:35 -05:00
Jonathan Kim
eb7b5b2cef [svn-r19406] Purpose:
Add --exclude-path option

Description:
 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 and heiwa
2010-09-16 16:46:16 -05:00
Allen Byrne
4bae291b1f [svn-r19403] Update to H5REPACK tests for layout info required a grep script like runTest.cmake.
Update CMakeLists.txt for new h5repack  layout tests.

Tested: local linux
2010-09-16 15:31:06 -05:00
Jonathan Kim
c561dc7183 [svn-r19400] Purpose:
Fix for Bug1975 h5diff - support recursive comparison on group when specified as an object

Description:
 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, heiwa
2010-09-16 12:48:06 -05:00
Quincey Koziol
e5575571d4 [svn-r19396] Description:
Bring back various modifications to the v2 B-trees that were introduced
in the revise_chunks branch but aren't dependent on any file format or API
changes.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.4 (amazon) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
2010-09-16 06:38:10 -05:00
Jonathan Kim
4c436595ab [svn-r19392] Purpose:
Additional fix for Bug 1821 - h5repack outputs compression information where it is not supposed to

Description:
 Remove unnecessary lopping code, which only lowers performance.

Tested:
 jam, amani, heiwa
2010-09-15 14:23:25 -05:00
Jonathan Kim
a6b6b75a79 [svn-r19389] Purpose:
Fix for Bug1896 h5repack - changing layout to COMPACT does not work

Description:
Make h5repack be able to convert a layout to COMPACT for small size dataset as default.  Also add verifying layout changes in our test script.

Tested:
 jam, amani, heiwa
2010-09-15 13:32:07 -05:00
Larry Knox
47c792faa0 [svn-r19366] Updated autoconf to version 2.6.7, libtool to version 2.2.10, and m4 to version 1.4.14. Also added m4 directory for m4 macros according to autoconf suggestion.
Tested with h5committest on amani, jam, and heiwa, and on linew.
2010-09-10 10:45:07 -05:00
Allen Byrne
bed1276413 [svn-r19361] Move Windows specific compile and link flags to macros 2010-09-09 11:30:23 -05:00
Allen Byrne
e65aa8c365 [svn-r19325] Added parallel build commands.
Corrected use/name of source folder aliases.
Duplicated FindMPI.cmake so that non-c++ compiler is found first (recommemded commands did not work).

Tested: local linux with mpich
2010-08-31 15:15:13 -05:00
Quincey Koziol
b8d1216dca [svn-r19324] Description:
Bring recent tweaks to extensible and fixed array file formats from
revise_chunks branch back to trunk.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.4 (amazon) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
2010-08-31 14:34:39 -05:00
Allen Byrne
696fd76cdf [svn-r19318] Correct ENDIF text (non-executable) to match IF parameter 2010-08-27 10:10:55 -05:00
Allen Byrne
da98c48d44 [svn-r19307] Correct test for H5_LONE_COLON - added NOT
Tested: windows
2010-08-26 09:36:52 -05:00
Allen Byrne
5c549a6345 [svn-r19300] BZ 1958: Add h5dump xml tests to CMake support
Tetsed: local linux
2010-08-25 17:33:59 -05:00
Quincey Koziol
0cd7123fb6 [svn-r19292] Description:
Merge r19290 & r19291 from 1.8 branch to trunk:

r19290:
Correct another error in metadata accumulator dirty region calculations
(this time with a corner case when freeing data in the file).

r19291:
Avoid getting object information for soft/external links if we aren't
going to traverse across the link itself.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.4 (amazon) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
2010-08-24 16:03:32 -05:00
Allen Byrne
11e5e1c588 [svn-r19286] Corrected name of file appearing in expected output.
(Missed edit from local test)
2010-08-24 08:47:43 -05:00
Allen Byrne
8c18457646 [svn-r19282] Fix test scripts (Cmake needs to capture output yet)
linux script needed -R and double compare:

Tested: local linux
2010-08-23 17:30:44 -05:00
Allen Byrne
ead3063885 [svn-r19265] Correct naming of SKIP test
Tested: local linux
2010-08-20 11:01:10 -05:00
Allen Byrne
f4c75504d4 [svn-r19262] Undo r19261. 2010-08-20 10:48:12 -05:00
Allen Byrne
4050bd2422 [svn-r19261] Remove unused variables and allocation
Tested: local linux
2010-08-20 10:38:15 -05:00
Quincey Koziol
d71fcfff2c [svn-r19255] Description:
Add missing include file from r19252.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.4 (amazon) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
2010-08-20 09:13:16 -05:00
Quincey Koziol
2f6e3cb5be [svn-r19252] Description:
Bring Coverity changes from branch to trunk:

r19161:
Fixed the part for matching the subset info with dataset

r19189:
BZ1646: h5dump does not check number of dimensions for subsetting parameters against the dataset

Changed subset_t structure from holding hsize_t pointers to holding new subset_d pointers, which hold the original hsize_t pointer + len. this len is then checked against dataset ndims in the handle_dataset function of h5dump.

Changed all references to use new data structure.

Added tests for each subset parameter.

r19190:
Added new h5dump ddl files

Tested on:
    Mac OS X/32 10.6.4 (amazon) w/debug & production
    (h5committested on branch)
2010-08-19 14:55:48 -05:00
Quincey Koziol
54d5a565f9 [svn-r19237] Description:
Clean up misc. compiler warnings.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
2010-08-12 16:11:00 -05:00
Allen Byrne
345a9a3c23 [svn-r19228] File read/write happens at configure time, so moved windows specific copy from test macro to where the expected file is copied.
Tested: windows
2010-08-11 11:49:20 -05:00
Allen Byrne
e41647d781 [svn-r19214] Test for compare of output text to expected needed to account for windows line endings.
Moved ADD_TEST commands to macro.

Tested: local linux, windows
2010-08-10 11:13:05 -05:00
Allen Byrne
eee9ca47a1 [svn-r19202] [BZ1953]implementation for the proposed changes suggested by the "h5dump_output_option" RFC. This required that the region reference code be duplicated and reduced to allow the do_bin_output() function to understand region references. The container type-id also needed to be propagated into the do_bin_output() function and functions referenced (render_bin_output*).
Existing tests tested the binary function, so only one test was added to test the region reference generated file.
Tested: local linux
2010-08-09 13:15:37 -05:00
Allen Byrne
6d22b60931 [svn-r19183] Corrected h5repack verbose test for windows
Updated tools/lib source dir variable for source list

Tested: local linux
2010-08-06 12:53:52 -05:00
Allen Byrne
5e2d5978e4 [svn-r19181] Added new h5repack test for bug1797 to CMakeLists.txt. Added corrected changes to test script for verbose filters
Tested: local linux
2010-08-06 10:04:38 -05:00
Quincey Koziol
0de252524d [svn-r19179] Description:
Bring changes from Coverity branch back to trunk:

r19079 & 19080:
[BZ1942]  h5dump -u to generate XML, it does not respect the -m option

xml version of dump_data function didn't check for use of fp_format variable.

Added new test expected file for committed bug 1942

r19103, 19104 & 19105:
[BZ1821] h5repack -v did not display correct output for a selected compression. Needed new test for comparing output of -v option.

Added new test file for solution to BZ1821

BZ1821 - Bring test changes from the shell script actually used.

Tested on:
    Mac OS X/32 10.6.4 (amazon) debug & production
    (h5committested on branch)
2010-08-05 18:19:01 -05:00
Raymond Lu
1b5fdb13ba [svn-r19173] Took out several redundant lines when object IDs are closed.
Tested on jam.
2010-08-05 12:09:49 -05:00
Quincey Koziol
eff803f824 [svn-r19156] Description:
Bring revisions from Coverity branch back to trunk:

r19044:
Coverity #449 - Line 1560 called function H5O_chunk_protect for 2 pointers to allocate. But when there's failure on the second one, the first wasn't freed 
(H5O_chunk_unprotect).  We fixed it by freeing the pointers when an error happens.

r19045:
Fixed coverity issue # 319.  Free sec_node in done if it is not NULL.

r19046:
Add intended but missing assignments to initialize pointers to NULL (coverity issue fixes).

r19049:
Hdf5_1_8_coverity branch was recreated from hdf5_1_8 branch in revision 18839 without fix for Coverity issue #84 having been propagated to the hdf5_1_8 branch.  This revision adds the fix again.

r19060:
added parentheses to see if they will keep subversion from getting confused

r19061:
Fix coverity item 139.  Fixed incorrect condition for freeing buffer on error.

Fix coverity items 20 and 21.  Removed unused NTESTS facility from dtypes.c.

Cleanup in H5Shyper.c.

r19062:
Fix coverity item 450.  Check to see if chk_proxy has been allocated before
attempting to free it.

Fix coverity item 454.  Check to see if allocation of buf failed in
H5D_fill_refill_vl.

Fix coverity items 455-457.  Initilize hid_t's to -1, check their value before
attempting to close them, and check if the close failed.

r19063:
New fix to address coverity issue #84.  Check that pointers in H5Z_xform_find_type are not NULL before passing them to H5T_cmp.

Tested on:
    Mac OS X/32 10.6.4 (amazon) w/debug & production
    (Too minor to require h5committest)
2010-07-30 13:06:32 -05:00
Quincey Koziol
7fe87a2472 [svn-r19153] Description:
Bring changes on Coverity branch back to trunk:

r19040:
Fixed coverity #440 - NULL check after dereference.  We moved the NULL check up
into the IF block and changed it to assertion.

r19041:
Maintenance: Addressed Coverity issues 441 and 449 by initializing proper
variables

r19042:
In function H5O_chunk_protect (H5Ochunk.c):
 - Initialize H5O_chunk_proxy_t pointers chk_proxy and ret_value.
 - Free chk_proxy on error.

r19043:
Addressed coverity issues 442 - 448 by initializing pointers to NULL.

Tested on:
    Mac OS X/32 10.6.4 (amazon) w/debug & production
    (Too minor to require h5committest)
2010-07-29 14:07:26 -05:00
Allen Byrne
0dce71a0a3 [svn-r19074] Added check for no encoding to determine result for test
Tested: Windows
2010-07-15 12:51:34 -05:00
Larry Knox
10a8b060ca [svn-r19059] Brought changes from hdf5_1_8 to add version information for fortran and c++ compilers in libhdf5.settings file and configure output (r18836), to install examples as part of make install (r18680), and to provide scripts to compile and run the examples after they are installed (r18817).
Tested with new/h5committest on amani, heiwa, and jam.
2010-07-08 21:52:14 -05:00
Jonathan Kim
5d5ffe2373 [svn-r19057] Purpose:
add reference file entries for the new test expected output files

Description:
    This is dependent to r19051.

Tested:
    Windows (cmake)
2010-07-08 11:37:40 -05:00
Jonathan Kim
af749bafb7 [svn-r19051] Purpose:
Add --no-dangling-links option to h5ls. 

Description:
Related to "Bug 1830 - Following an dangling external link in h5ls should set non-zero return code."
If --no-dangling-links option is specified and any dangling link is found, return exit code 1 (error).

Tested:
 jam, amani and heiwa
2010-07-07 13:52:04 -05:00
Allen Byrne
2f13382883 [svn-r19037] Added executable Linker Flag for MSVC static builds: /NODEFAULTLIB:MSVCRT
Added VERSION vars for inclusion into auto snapshot version update script

Tested windows
2010-06-29 15:09:03 -05:00
Jonathan Kim
eb5eba9aee [svn-r19034] Purpose:
Change h5ls not to manipulate special characters in object name or attribute name for smart display.

Description:
Related to "But1784 h5ls has input and output issues with links that have '\' characters in them."

Tested:
 jam, amani and linew
2010-06-28 15:34:32 -05:00
Albert Cheng
ed9a9f8c50 [svn-r18985] Test feature: (bugs 1919)
Problem: some launching command like yod (and sometimes mpirun), do not pass
back the exit code of the executables back to the shell. It always returns 0
if it can launch the executable. This cause tests that expect non-zero exit
code to fail incorrectly.

Short term Solution:
Added the feature that if $RUNSERIAL_NOEXITCODE is defined, do not
test conditions that rely on non-zero exit code.

Tests:
dove-linux using RUNSERIAL=thgyod to see the failures and using
$RUNSERIAL_NOEXITCODE=yes to bypass the errors.
Also h5committested.
2010-06-08 13:22:11 -05:00
Albert Cheng
21d186a8e7 [svn-r18984] Description:
Fixed exit code (sometimes return code in Main) to follow the HDF5 standards.

Tested:
Tested in Dove-linux only since change is trivial and has passed in v1.8.
2010-06-07 18:44:27 -05:00