Commit Graph

104 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
Allen Byrne
5c84b51030 [svn-r24024] JAVA-1714: CMake packaging for macs improved
HDFFV-7989: h5dump any_path and help text grouping
Added cygwin-64 support

Merged from trunk, tested local linux
2013-08-19 11:51:32 -05:00
Vailin Choi
dd327986b9 [svn-r24014] This checkin is a merge of the checkin for h5stat to the trunk (rev #23975-23977) + an additional bug fix--
A) Fix for HDFFV-1238:
   --Add 3 new options to allow users in setting threshold for small groups/datasets/attributes (tools/h5stat/h5stat.c)
   --Generate new test file for testing the new options (tools/h5stat/h5stat_gentest.c)
   --Add tests for the new options (tools/h5stat/testh5stat.sh.in)
   --Update expected output files (tools/h5stat/testfiles/*.ddl)
B) Fix a bug in determining maximum dimension size for 1-D dataset in dataset_stats() (tools/h5stat/h5stat.c)
C) Fix a bug when using opt_arg that is NULL for the new options.
2013-08-16 14:20:34 -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
HDF Tester
ab5a49b8bd [svn-r23324] Snapshot version 1.8 release 11 (snap11) 2013-03-03 21:47:16 -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
Albert Cheng
853b1cf7d7 [svn-r23069] Bug fix: HDFFV-8233
testh5stat.sh fails in LLNL uDawn. The test actually ran as expected
but it did not prepare for the extra error messages from the MPI
process.

Solution:
This sort of problem has been fixed by using the output filters in
output_filter.sh. testh5stat.sh is updated to use the output filters.

Tested:
uDawn.
2012-11-30 00:50:17 -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
Allen Byrne
5336fb2d01 [svn-r22719] Fix RelWithDebInfo packaging
Tested: windows
2012-08-28 12:38:44 -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
Jonathan Kim
e8197d1941 [svn-r22621] Purpose:
HDFFV-8107 testh5diff will fail if build/test in HDF5 source tree

Description:
  This is sub-task for "HDFFV-8105 testh5diff.sh uses the wrong operator (-a) in an if statement."
  From the HDFFV-8105's update, h5diff test failed if build&test is performed in HDF5 source tree because 'cp' try to copy test files to self dir. 
  It's addressed by skipping if cp's src dir and dest dir is same.
  Also this applied for all other tools under src/tools dir.
  No change to the CMakeLists.txt files because CMake cautions/demands that in-source builds be avoided.
  Merged from HDF5 trunk r22617.

  
Tested: 
 jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), some manual tests as well
2012-08-02 14:32:38 -05:00
Allen Byrne
17f1e60d93 [svn-r22475] Remove subfolder tools from install command 2012-06-19 11:41:48 -05:00
Allen Byrne
62ce2569cf [svn-r22453] Add missing property for resultcode of 1 to MEMCHECKER tests 2012-06-12 08:50:47 -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
Allen Byrne
e5c0e3d57f [svn-r22443] Add new test to CMake file
Tested: local linux
2012-06-07 09:41:43 -05:00
Vailin Choi
c2059c656a [svn-r22440] This is part of the previous checkin--#22438.
A new ddl to be added.
2012-06-06 16:51:49 -05:00
Vailin Choi
596d5b2662 [svn-r22438] (1) fix for making MEM_GHEAP as MEM_DRAW
(2) fix to extend into the aggregator based on threshold 
(3) fix for the "flavor" logging problem
(4) fix for test failures due to the above fixes
(5) bug fix for h5stat when h5stat against a non-existing file

--Ths line, and th se below, will be ignored--

M    test/mf.c
M    src/H5MFaggr.c
M    src/H5FDpublic.h
M    src/H5MF.c
M    src/H5FDmulti.c
M    src/H5FDlog.c
M    src/H5Faccum.c
M    tools/h5copy/testfiles/h5copytst.out.ls
M    tools/h5copy/testfiles/h5copy_ref.out.ls
M    tools/h5stat/testh5stat.sh.in
M    tools/h5stat/h5stat.c
2012-06-06 16:12:34 -05:00
Quincey Koziol
068ae2a14f [svn-r22177] Description:
Merge "summary" option ('-S') from trunk to 1.8 branch.

Tested on:
    Mac OSX/64 10.7.3 (amazon) w/debug
    (h5committest forthcoming)
2012-03-28 17:27: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
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
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
Allen Byrne
ada604b46f [svn-r21216] Alter clear-objects tests to mate with test that generates object file.
Tested: local linux
2011-08-10 16:08:38 -05:00
Jonathan Kim
07f28d8071 [svn-r21064] Purpose:
Work for HDFFV-7602 - HDF5 command tools: Provide framework for reusable 
    test files among tools
Description:
    Merged from HDF5 trunk r21057
    Provide framework to share test files among tools for tools test.

Tested:
    jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE)
2011-07-01 17:22:58 -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
Allen Byrne
44e5d2a1d7 [svn-r20904] Bring r20871, 20875, 20901, 20903 from trunk.
Tested: local linux
2011-05-25 10:27:58 -05:00
Allen Byrne
a56750c9b5 [svn-r20802] Bring trunk revision 20798 to 1.8. Trunk changes passed overnight.
Tested: local linux
2011-05-12 12:23:43 -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
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
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
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
Quincey Koziol
97d7903312 [svn-r19589] Description:
Correct minor error in sizes of objects on 1.8 branch.

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
2010-10-13 12:43:18 -05:00
Quincey Koziol
a294ddffe5 [svn-r19588] Description:
Bring r19587 from trunk to 1.8 branch:

	Address issue with object headers being created getting evicted from
the metadata cache cache before they are completely initialized.  This is
done by pinning the object header in the cache until it is completely
initialized and attached to a group.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, 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
2010-10-13 11:17:52 -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
Raymond Lu
bb87e6bac6 [svn-r19479] I'm backing out my fix for bug 1707 because there're some unresolved issues - r19441 and 19466.
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.

Tested on jam - backing out, simple.
2010-09-27 12:53:37 -05:00
Raymond Lu
d688fc55a9 [svn-r19441] Bug fix for 1707 - in a hurry, explain later.
tested on jam and amani, heiwa hasn't finished yet.
2010-09-20 16:57:57 -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
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
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
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