Commit Graph

254 Commits

Author SHA1 Message Date
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
Quincey Koziol
a33303139e [svn-r24032] Description:
Bring r24030 from trunk to 1.8 branch:

    Clean up more compiler warnings.

Tested on:
    Mac OSX/64 10.8.4 (amazon) w/gcc, C++ & FORTRAN
    (too minor to require h5committest)
2013-08-19 19:55:47 -05:00
Quincey Koziol
6e58f671ec [svn-r24021] Description:
Bring r24020 from trunk to 1.8 branch:

    Clean up compiler warnings

Tested on:
    Mac OSX/64 10.8.4 (amazon) w/C++ & FORTRAN
    (too minor to require h5committest)
2013-08-17 19:31:01 -05:00
Quincey Koziol
efb39881a0 [svn-r24012] Description:
Bring r24011 from trunk to 1.8 branch:

    Clean up a few warnings

Tested on:
    Mac OSX 10.8.4 (amazon) w/C++ & FORTRAN
    (too minor to require h5committest)
2013-08-15 08:27:24 -05:00
Allen Byrne
528e0d1cac [svn-r23869] HDFFV-8302: replace (v)snprintf with _(v)snprintf for windows. Merge from trunk along with other windows functions and HD prefix corrections.
HDFFV-8394: Add cmake code to package examples

Tested: local linux
2013-07-08 10:52:49 -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
Quincey Koziol
afc68537cd [svn-r23696] Description:
Bring r23695 from trunk to 1.8 branch:

Clean up warnings in H5Tconv.c (down to _only_ 9000 lines of output now!)

Merge changes from Coverity branch back to trunk:

r20684:
Fix for coverity bug #1721 which was due to the fix for coverity bug #943.

r20685:
Use HDstrncpy. --gh

r20761:
Purpose: Fix valgrind issues

Description:
Free image_data and data as appropriate in test_image.

r20762:
Purpose: Fix coverity issue 600

Description:
Add check for return value of H5O_close in H5Ocopy.  Also cleaned up various
warnings.

r20763:
Purpose: Fix valgrind issues with h5stat

Description:
Modified h5stat to free "iter" before exit, and free "hand" before exit if
parse_command_line exits directly.

r20764:
fixed coverity issues:
69, 327, 614, 684, 685, 696, 697, 1681, 967, 826, 660, 80

r20765:
Fixed coverity bug 668

Pulled x * y * z multiply out of malloc operand into a separate n_elements variable to quiet integer overflow warning.

No actual integer overflow tests are performed since it's just a test program but I did add a check that n_elements is >= 1.

I also changed an error condition from doing its own close and returning -1 to "goto out;" like the rest of the program.

r20766:
Fixed coverity bug 667

Pulled x * y * z multiply out of malloc operand into a separate n_elements variable to quiet integer overflow warning.

No actual integer overflow tests are performed since it's just a test program.


Tested on:
    Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
    (h5committest upcoming)
2013-05-11 11:42:54 -05:00
Quincey Koziol
f4d23a1400 [svn-r23598] Description:
Bring r23597 from trunk back to 1.8 branch:

Bring r20683 from Coverity branch back to trunk:

Isues 1309-1333: Changed strcpy/strcat to strncpy/strncat with maximum size expe

Tested on:
    Max OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
2013-04-17 09:04:38 -05:00
Allen Byrne
fa964fa019 [svn-r23413] Add test depends on clear test. Occasional failures. 2013-03-21 09:25:18 -05:00
HDF Tester
ab5a49b8bd [svn-r23324] Snapshot version 1.8 release 11 (snap11) 2013-03-03 21:47:16 -05:00
Scot Breitenfeld
c3fe966251 [svn-r23291] brought r23241 into the branch.
Fix for: HDFFV-7596
H5DSget_scale returns size that includes NULL termination and H5DSget_label returns size NOT including NULL termination
2013-02-17 19:46:21 -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
Raymond Lu
badedee44d [svn-r23182] I'm merging the changes for DECTRIS project from the trunk (r23162).
Tested on koala, jam, ostrich.
2013-01-21 17:47:00 -05:00
Scot Breitenfeld
c194d4738a [svn-r23122] Brought revisions from the trunk into the branch:
r23116-23118 : HDFFV-2686: Remove the ptExampleVL.c example from the source code
               HDFFV-422: Change extention of the binary files from hdf5 to h5

Tested: jam (gnu)
2012-12-30 21:09:50 -05:00
Scot Breitenfeld
bac0fbe4d6 [svn-r23112] Brought revision 22610 from the trunk to the branch:
svn merge -r 22609:22610 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/hl .

Fixes bug HDFFV-8055 (and HDFFV-8278)
2012-12-20 00:44:13 -05:00
Raymond Lu
31e931ce26 [svn-r22821] Issue 8164 - test_image.c printed an extra "FAILED" after it succeeded. A test function doesn't return 0 after it succeeds.
It goes down to the error handling branch and prints "FAILED".  The fix is adding "return 0;" in the end of the function.  

Tested on jam - simple change.
2012-09-27 10:19:29 -05:00
Raymond Lu
cf485eb7cc [svn-r22756] When Scot Breitenfeld committed his test function test_valid_path in r22206 6 months ago, he replaced test_text_type
function with his function, thus skipped test_text_type test.  I'm restoring it back in this checkin.

Tested on jam - simple change.
2012-09-12 11:55:16 -05:00
Allen Byrne
612af6440b [svn-r22724] Convert tests to *.sh.in.
Convert configure.in to configure.ac.
Align TESTS usage with autotools convention.
Update all references from configure.in to configure.ac

Tested: h5committest
2012-08-28 14:11:34 -05:00
Larry Knox
073ba00980 [svn-r22711] Updated autotools: autoconf 2.69, automake 1.12.3, m4 1.4.16, libtool 2.4.2
Tested THG machines.
2012-08-23 12:05:07 -05:00
Quincey Koziol
4e6b652c3d [svn-r22647] Description:
Bring r22646 from trunk to 1.8 branch:

    Changes resulting from Klocwork static analysis tool, from Mark Miller
@ LLNL (miller86@llnl.gov).

Tested on:
    Mac OS X/64 10.7.4 (amazon) w/debug, C++ & FORTRAN, using gcc 4.7.x
    (too minor to require h5committest)
2012-08-08 20:02:02 -05:00
HDF Tester
11ddad75fb [svn-r22488] Snapshot version 1.8 release 10 (snap4) 2012-06-24 19:22:53 -05:00
Quincey Koziol
2725ab3daf [svn-r22485] Description:
Merge r22484 from trunk to 1.8 branch:

    Copy the file image test file from the source directory to the build
directory, instead of trying to open the [in-memory] file R/W.

    Also, clean up a few other test files that were left lying around from
other tests.

Tested on:
    MacOSX/64 10.7.4 (amazon) w/debug
    Too minor to require h5committest
2012-06-23 18:40:53 -05:00
Allen Byrne
fe744bd8df [svn-r22412] reduce compiler warnings by removing unreferenced variables and adding cast
Tested: local linux
2012-05-25 12:58:59 -05:00
Quincey Koziol
362f22119d [svn-r22228] Description:
Bring r22219 from trunk to 1.8 branch: (with release manager's blessing)

      Merge "file image" changes from feature branch back to trunk.

Tested on:
   h5committested
2012-04-01 17:27:15 -05:00
Scot Breitenfeld
d63add741b [svn-r22206] Merged changes from the trunk in to the branch, used:
svn merge -r r22040:22205 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/hl

Tested: jam (gnu and intel compilers)
2012-03-29 19:45:04 -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
Allen Byrne
6a2c50b10a [svn-r22025] Cleanup compiler warnings.
Add HD prefix to tools library based tests. Cleaned allocation/free in tests.

Tested: local linux/ h5committetest
2012-03-05 09:19:02 -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
Raymond Lu
5c7353d2cd [svn-r21439] Issue 7701 - H5LTdtype_to_text had memory corruption while being querried about the size of the buffer needed. The problem happened when the internal buffer is reallocated, the new address got lost. I revised the code to pass the new address as the return value of functions. I also added two new test cases.
This commit only includes hl/test/test_lite.c, hl/src/H5LT.c, hl/src/H5LTprivate.h.  All others are property changes of the merge from the trunk.  

Tested on jam, linew, and koala.
2011-09-30 15:24:50 -05:00
Scot Breitenfeld
4af3cd2b7a [svn-r21421] Merged the Fortran 2003 changes from the trunk into the 1.8 branch, used:
svn merge -r 20506:21414 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

Tested: jam (gnu, intel, pgi compilers)

Also merged effected non-Fortran files: 
svn merge -r21247:r21248 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/src/libhdf5.settings.in
2011-09-27 00:02:38 -05:00
Scot Breitenfeld
359ab12d1e [svn-r21182] Desciption: brought revision 21157 from the trunk to the branch. Fixes hl bug
HDFFV-7673 -- DS library segfaults when retrieveing length of the dimension label that was not set

Tested: jam (gnu 4.5 compiler)
2011-08-06 19:16:08 -05:00
Mike McGreevy
d93ae26226 [svn-r21044] Purpose:
Fix HDFFV-7592

    "Remove PACKEDBITS option from autotools files"

Description:
    The code for h5dump's packed bits feature was
    conditionally compiled in via this option during its
    'beta' release in 1.8.5. Now that the feature is fully
    supported, h5dump has since been changed to always
    compile the packed bits code (having removed the #ifdef
    H5_HAVE_H5DUMP_PACKED_BITS checks), so this option in
    configure is no longer needed.

    This commit removes the --enable-h5dump-packed-bits
    configure option, including the help summary from
    './configure --help' and the libhdf5.settings output
    summary, the PACKED_BITS Makefile variable, and the
    definition of H5_HAVE_H5DUMP_PACKED_BITS define in
    appropriate pubconf header files (which has already
    been removed from use in source code as of r20722).

    Note that this option was never added to the trunk,
    thus this commit only need occur on the 1.8 branch.

Tested:
    - Configure output, help, & summary verified on jam
    - h5committested
2011-06-28 16:25:10 -05:00
Scot Breitenfeld
5fde8ebdc2 [svn-r20957] Description: brought rev. 20937 from trunk, additional test for attaching and detaching DS.
Teste: jam (intel)
2011-06-09 21:34:35 -05:00
Scot Breitenfeld
4dd38b9f5b [svn-r20931] Purpose: brought revisions 20870 and 20923 from the trunk
to fix bug HDFFV-7605

Tested: jam (intel compiler)
2011-06-05 16:09:49 -05:00
Mike McGreevy
699098014b [svn-r20525] Description:
Merge revisions 20475, 20502, and 20504 from trunk to 1.8 branch.

Tested:

    Tested on jam, fred, bangan (CYGWIN), and h5committested.
2011-04-15 15:41:32 -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
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
Larry Knox
e48acc4119 [svn-r19862] Updated libtool to version 2.4, autoconf to version 2.68, and m4 to version 1.4.15.
Tested with h5committest on amani, jam and heiwa.
2010-12-01 10:12:06 -05:00
Quincey Koziol
d1117ac78c [svn-r19655] Description:
Bring r19654 from trunk to 1.8 branch:

Bring Coverity revisions from branch back to trunk, and clean up some other
misc. compiler warnings also.

r19500:
Fix coverity items 1446 and 1447.  Moved up calls to memset in test_cont in
ohdr.c so the test never tries to close uninitialized locations.

r19501:
Fix coverity items 1398-1445.  Various uninitialized variable errors in fheap.c.

r19502:
Fixed coverity issue 579 and some additional warnings in the file as well.

r19503:
Bug fix: This fix addressed the "RESOURCE_LEAK" problems #789 and 790, run 26

r19504:
minor mods to try to keep coverity from flagging false positives.

r19505:
Fixed coverity issues 566 - 571.  Declared variables that are passed to functions that use them as arrays to be arrays of size 1.


Tested on:
   Mac OS X/32 10.6.4 (amazon) w/debug, production & parallel
  (h5committested on coverity branch)
2010-10-21 09:08:13 -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
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
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
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
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
Allen Byrne
02a2333199 [svn-r18860] pull r18858 from 185;
Cange allocation of buffer to use the specified dimensions to calculate the size of a data buffer. Also removed any initialized values.
2010-05-19 17:13:23 -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
Elena Pourmal
b8f131dc78 [svn-r18820] Bug fix:
Fixed a bug (1822) in the H5DSdetach_scale function when 0 bytes
    were allocated after the last reference to a dim. scale
    was removed from the list of references in a VL element of the
    DIMENSION_LIST attribute; modified the function to comply
    with the Spec: DIMENSION_LIST attribute is deleted now when no
    dimension scales left attached.

Platforms tested: jam with electric fence, amani amd linew
2010-05-14 23:28:50 -05:00