Commit Graph

2209 Commits

Author SHA1 Message Date
Larry Knox
91565db209 [svn-r19421] Reorganize compile scripts h5cc.in, h5fc.in and h5c++.in to put LDFLAGS in the correct place and to enable the script user to set and override CFLAGS, CPPFLAGS, CXXFLAGS, FFLAGS, LDFLAGS, and LIBS that take pprecedence over the library paths and compile flags from the hdf5 build.
Tested with h5committest on amani, heiwa, and jam.
2010-09-17 18:09:03 -05:00
Allen Byrne
36003ca79c [svn-r19419] 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:06:49 -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
Larry Knox
696675029e [svn-r19408] In this revision the '/' after ${DESTDIR} wherever it occurs
has been removed. According to the official description of DESTDIR by Gnu at
http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is
prepended to the normal and complete install path that it precedes for the
purpose of installing in a temporary directory which is useful for building
rpms and other packages.  The '/' after ${DESTDIR} will be followed by another
'/' at the beginning of the normal install path.  When DESTDIR is empty the
path then begins with '//', which is incorrect and causes problems at least for
Cygwin.

The change made in config/commence.am affects many Makefile.*s when bin/reconfigure
is run.  EXAMPLEDIRs had to be corrected individually.

Also the scripts to run examples after they are installed have checks added to see 
that the fortran and c++ directories are present before trying to run the scripts 
in them.

Tested with h5committest on amani, heiwa and jam.
2010-09-16 17:12:07 -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
Allen Byrne
607c97c175 [svn-r19404] 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:46 -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
Quincey Koziol
6fb5f819a5 [svn-r19397] Description:
Bring r19396 from trunk to 1.8 branch:

	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 07:28:29 -05:00
Jonathan Kim
3755fa1822 [svn-r19393] Purpose:
Additional fix for Bug 1821 - h5repack outputs compression information where it is not supposed to

Description:
 Merged from hdf5 trunk (r19392)
 Remove unnecessary lopping code, which only lowers performance.

Tested:
 jam, amani
2010-09-15 14:29:11 -05:00
Jonathan Kim
f4af852764 [svn-r19391] Purpose:
Fix for Bug1896 h5repack - changing layout to COMPACT does not work

Description:
Merged from hdf5 trunk (r19389)
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
2010-09-15 14:00:44 -05:00
Larry Knox
23bc2c0b38 [svn-r19371] 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.

-This line, and those below, will be ignored--

M    hdf5_1_8/test/Makefile.in
A    hdf5_1_8/m4
AM   hdf5_1_8/m4/ltsugar.m4
AM   hdf5_1_8/m4/libtool.m4
AM   hdf5_1_8/m4/ltversion.m4
AM   hdf5_1_8/m4/lt~obsolete.m4
AM   hdf5_1_8/m4/ltoptions.m4
M    hdf5_1_8/configure
M    hdf5_1_8/Makefile.in
M    hdf5_1_8/testpar/Makefile.in
M    hdf5_1_8/configure.in
M    hdf5_1_8/src/Makefile.in
M    hdf5_1_8/tools/Makefile.in
M    hdf5_1_8/tools/misc/Makefile.in
M    hdf5_1_8/tools/h5dump/Makefile.in
M    hdf5_1_8/tools/h5repack/Makefile.in
M    hdf5_1_8/tools/h5jam/Makefile.in
M    hdf5_1_8/tools/h5diff/Makefile.in
M    hdf5_1_8/tools/lib/Makefile.in
M    hdf5_1_8/tools/h5copy/Makefile.in
M    hdf5_1_8/tools/h5import/Makefile.in
M    hdf5_1_8/tools/h5stat/Makefile.in
M    hdf5_1_8/tools/h5ls/Makefile.in
M    hdf5_1_8/hl/test/Makefile.in
M    hdf5_1_8/hl/tools/Makefile.in
M    hdf5_1_8/hl/tools/gif2h5/Makefile.in
M    hdf5_1_8/hl/Makefile.in
M    hdf5_1_8/hl/src/Makefile.in
M    hdf5_1_8/hl/c++/test/Makefile.in
M    hdf5_1_8/hl/c++/Makefile.in
M    hdf5_1_8/hl/c++/src/Makefile.in
M    hdf5_1_8/hl/c++/examples/Makefile.in
M    hdf5_1_8/hl/fortran/test/Makefile.in
M    hdf5_1_8/hl/fortran/Makefile.in
M    hdf5_1_8/hl/fortran/src/Makefile.in
M    hdf5_1_8/hl/fortran/examples/Makefile.in
M    hdf5_1_8/hl/examples/Makefile.in
M    hdf5_1_8/config/commence.am
M    hdf5_1_8/MANIFEST
M    hdf5_1_8/c++/test/Makefile.in
M    hdf5_1_8/c++/Makefile.in
M    hdf5_1_8/c++/src/Makefile.in
M    hdf5_1_8/c++/examples/Makefile.in
M    hdf5_1_8/bin/ltmain.sh
M    hdf5_1_8/bin/reconfigure
M    hdf5_1_8/perform/Makefile.in
M    hdf5_1_8/fortran/test/Makefile.in
M    hdf5_1_8/fortran/testpar/Makefile.in
M    hdf5_1_8/fortran/Makefile.in
M    hdf5_1_8/fortran/src/Makefile.in
M    hdf5_1_8/fortran/examples/Makefile.in
M    hdf5_1_8/aclocal.m4
M    hdf5_1_8/examples/Makefile.in
2010-09-10 17:41:44 -05:00
Allen Byrne
ff47a7df1b [svn-r19362] Move Windows specific compile and link flags to macros 2010-09-09 11:31:46 -05:00
Allen Byrne
6825fe1506 [svn-r19332] Removed extranous string from list of ddl files. 2010-09-01 09:46:29 -05:00
Allen Byrne
c9cf76d5f9 [svn-r19326] 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).
Bring r19325 from trunk

Tested: local linux with mpich
2010-08-31 15:20:12 -05:00
Allen Byrne
4f5ce13471 [svn-r19319] Correct ENDIF text (non-executable) to match IF parameter 2010-08-27 10:11:11 -05:00
Allen Byrne
9ab20786ab [svn-r19308] Correct test for H5_LONE_COLON - added NOT
Bring r19307 from trunk

Tested: windows
2010-08-26 09:37:27 -05:00
Allen Byrne
6cea4f52ce [svn-r19301] BZ 1958: Add h5dump xml tests to CMake support
Bring r19300 from trunk

Tetsed: local linux
2010-08-25 17:35:26 -05:00
Quincey Koziol
02a65c4685 [svn-r19291] Description:
Avoid getting object information for soft/external links if we aren't
going to traverse across the link itself.

Tested on:
    Linux/64 2.6 (chicago) w/debug & production
    (h5committest coming up)
2010-08-24 14:57:38 -05:00
Allen Byrne
d65e4dbd7e [svn-r19287] Corrected name of file appearing in expected output.
(Missed edit from local test)
2010-08-24 08:48:15 -05:00
Allen Byrne
23da86c0dc [svn-r19280] Fix test scripts (Cmake needs to capture output yet)
linux script needed -R and double compare:

Tested: local linux
2010-08-23 17:28:52 -05:00
Allen Byrne
eb0cc7a576 [svn-r19266] Remove configuration of cmake zlib config filed which has been deleted.
Correct naming of SKIP test
Tested: local linux
2010-08-20 11:01:45 -05:00
Allen Byrne
82799772ad [svn-r19263] Undo r19258 2010-08-20 10:48:42 -05:00
Allen Byrne
fc975cffa2 [svn-r19258] Remove unused variables and allocation
Tested: local linux
2010-08-20 10:18:41 -05:00
Allen Byrne
456ebba0fb [svn-r19257] Change Cmake to allow a local zlib header to be used in H5Zdelate module.
Corrected use of "SKIP" message in cmake.
Corrections to cmake configuration files (for cmake external projects).

Community suggested changes.

Tested: local linux
2010-08-20 10:16:06 -05:00
Quincey Koziol
7c31e7873c [svn-r19256] Description:
Bring r19255 from trunk to 1.8 branch:

	Add missing include file from r19252.

Tested on:
       (Eyeballed only, too simple to require h5committest)
2010-08-20 09:14:58 -05:00
Quincey Koziol
525caddd9e [svn-r19254] Description:
Bring r19252 & 19253 from trunk to 1.8 branch:

   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 Coverity branch)
2010-08-19 16:16:28 -05:00
Quincey Koziol
d9af3b4fdf [svn-r19238] Description:
Bring r19237 from trunk to 1.8 branch:

	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:27:02 -05:00
Allen Byrne
051cf48d0b [svn-r19226] 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:48:38 -05:00
Allen Byrne
ecdf033499 [svn-r19213] 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:07:54 -05:00
Allen Byrne
02b5824f57 [svn-r19198] [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 12:15:06 -05:00
Allen Byrne
ab1051e0b0 [svn-r19184] Corrected h5repack verbose test for windows
Updated tools/lib source dir variable for source list

Tested: local linux
2010-08-06 13:06:30 -05:00
Quincey Koziol
ae32ba97fd [svn-r19182] Description:
Bring r19179 from trunk to 1.8 branch:

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-06 12:51:53 -05:00
Raymond Lu
2d9d60aef1 [svn-r19177] Took out several redundant lines when object IDs are closed.
Tested on jam.
2010-08-05 12:16:51 -05:00
Quincey Koziol
77b2235f8b [svn-r19158] Description:
Bring r19156 from trunk to 1.8 branch:

    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
    (h5committested on Coverity branch)
2010-07-30 13:21:54 -05:00
Quincey Koziol
6e3ff79f0c [svn-r19154] Description:
Bring r19153 from trunk to 1.8 branch:

    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:17:29 -05:00
Allen Byrne
bb02990b22 [svn-r19073] Added check for no encoding to determine result for test
Tested: Windows
2010-07-15 12:51:04 -05:00
Jonathan Kim
08bc4af366 [svn-r19058] Purpose:
add reference file entries for the new test expected output files

Description:
    This is related to r19053.

Tested:
    Windows (cmake)
2010-07-08 11:46:20 -05:00
Jonathan Kim
435f58c1b8 [svn-r19053] 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).
Merged from hdf5 trunk r19051

Tested:
 jam, amani, heiwa
2010-07-07 15:06:20 -05:00
Allen Byrne
286b06971d [svn-r19036] 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:04:46 -05:00
Jonathan Kim
5ed817f734 [svn-r19035] Purpose:
Change h5ls not to manipulate special characters in object name or attribute name for smart display.

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

Tested:
 jam, amani
2010-06-28 16:47:00 -05:00
Albert Cheng
e8886d2d6a [svn-r18986] 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:23:48 -05:00
Jonathan Kim
d8947d7370 [svn-r18961] Purpose:
Fixed Windows compile error. Renamed to use 'gid1' and 'gid2' instead of 
  'grp1' and 'grp2'. 

Description:
  This is related SVN r18946. 
  There is variable name confliction with 'grp1' ~ 'grp9' in Windows system. 
  It occurs if H5private.h is included in the code.
2010-06-03 15:27:24 -05:00
Jonathan Kim
3aa2b25b99 [svn-r18946] Purpose:
Support follow symbolic links.

Description:
    Merged from hdf5 trunk r18943.
    Add '--follow-symlinks' option to follow symbolic links (soft and external).
    Update help page according to RM.
    Remove some warning messages from compiler.

Tested:
    jam
2010-06-02 14:53:59 -05:00
Albert Cheng
fdaeddcdcd [svn-r18892] Improvment:
Revised the online help page of h5dump to explain the packed bits feature and
added an example too.

Tested: h5committest plus jam tested with --disable-h5dump-packedbits.
2010-05-25 15:29:36 -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
0fe834c473 [svn-r18855] Added CPack commands for installtion program
Tested: local linux and Windows
2010-05-19 15:03:17 -05:00
Allen Byrne
210f3f9676 [svn-r18847] Removed obsolete packed bits tests 2010-05-18 12:32:02 -05:00
Larry Knox
a41fb65b7c [svn-r18836] Added code to config files, libhdf5.settings.in and configure.in to add compiler version information for fortran and C++ in the settings file and the configure output for our common compilers on linux, solaris, and mac(gnu only).
Tested:  amani, jam, linew (h5committest) and with configure on these machines and tejeda.
2010-05-17 17:23:23 -05:00
Allen Byrne
b2b00a7c4d [svn-r18830] Updated CMake file with r18826
Tested: local linux
2010-05-17 14:51:06 -05:00