Commit Graph

16476 Commits

Author SHA1 Message Date
Dana Robinson
09882f7ccd Merge pull request #480 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:cmake_header_create to develop
* commit '80d57c242a15edd983673e9bad4e966c72975289':
  Set the HDF5_GENERATE_HEADERS CMake option to default to ON and removed the option from the CMake cache init files.
2017-04-27 15:07:57 -05:00
Dana Robinson
80d57c242a Set the HDF5_GENERATE_HEADERS CMake option to default to ON and removed
the option from the CMake cache init files.

Fixes HDFFV-10184
2017-04-27 15:18:18 -04:00
Larry Knox
c2729b6ad1 Merge pull request #478 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'a302f508a51ba9fe109aaacda24601d5c458fe8d':
  Change position of declaration to top of block
2017-04-27 08:55:41 -05:00
Allen Byrne
a302f508a5 Change position of declaration to top of block 2017-04-27 08:52:34 -05:00
Vailin Choi
2d535d8c88 Merge pull request #473 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit 'bacb45b38ae8513024baf2dfe08c8918625489e2':
  Modifications based on pull request review. Made couple changes based on the review comments.
  Incorporate patch from GE Healthcare (HDFFV-9934) This is the same patch that had already been integrated to 1.8 branch (pull request #387). Tested on moohan, ostrich, platypus, emu, osx1010test, quail, kituo, mayll.
2017-04-26 14:04:24 -05:00
Vailin Choi
bacb45b38a Modifications based on pull request review.
Made couple changes based on the review comments.
2017-04-26 14:00:34 -05:00
Vailin Choi
cb8e82a53d Incorporate patch from GE Healthcare (HDFFV-9934)
This is the same patch that had already been integrated to 1.8 branch (pull request #387).
Tested on moohan, ostrich, platypus, emu, osx1010test, quail, kituo, mayll.
2017-04-25 18:08:53 -05:00
Allen Byrne
9c30b39316 Merge pull request #470 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '2420df5a85c64a20d98165c5b8c891899b31da83':
  HDFFV-10170 revert entire change
2017-04-25 16:54:02 -05:00
Allen Byrne
2420df5a85 HDFFV-10170 revert entire change 2017-04-25 16:34:52 -05:00
Larry Knox
4d1d2b4eda Merge pull request #468 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '89fbe00dec8187305b518d91c3ddb7d910665f79':
  Merge pull request #426 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
  Commit copyright header change for src/H5PLpkg.c which was added after running script to make changes.
2017-04-25 16:09:10 -05:00
Larry Knox
89fbe00dec Merge pull request #426 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '54957d37f5aa73912763dbb6e308555e863c43f4':
  Commit copyright header change for src/H5PLpkg.c which was added after running script to make changes.
  Add new files in release_docs to MANIFEST. Cimmit changes to Makefile.in(s) and H5PL.c that resulted from running autogen.sh.
  Merge pull request #407 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10_1 to hdf5_1_10_1
  Change copyright headers to replace url referring to file to be removed and replace it with new url for COPYING file.
2017-04-25 16:05:36 -05:00
lrknox
1073ac45ef Commit copyright header change for src/H5PLpkg.c which was added after running script to make changes. 2017-04-25 15:59:21 -05:00
Dana Robinson
e8a0726636 Merge pull request #464 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:bin_trace_complain to develop
* commit 'b1a5ba405393da68028cf1c8b159a3abb51d2187':
  Updated bin/trace to emit errors and reordered autogen.sh processing so that script failures leave the library in a non-compilable state, making it harder to ignore errors.
2017-04-25 12:52:41 -05:00
Dana Robinson
b1a5ba4053 Updated bin/trace to emit errors and reordered autogen.sh processing
so that script failures leave the library in a non-compilable state,
making it harder to ignore errors.
2017-04-25 02:09:55 -04:00
Allen Byrne
9d84abe503 Merge pull request #457 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '0fb5ce7ad50664f800ffe7e107e0fb0f90f66e12':
  Correct name of native function
  Fix javadoc
  Fix typo
  Signature change requires a ptr
  Change     H5PLsize() signature
  Revert HDFFV-9655
  Changed signature of H5PLgetsize
  Revert HDFFV-9655 by disabling test and not using new function.
  Fix path to actual executable location
  Windows ahs one more directory level
2017-04-24 16:44:35 -05:00
Allen Byrne
0fb5ce7ad5 Correct name of native function 2017-04-24 16:21:42 -05:00
Allen Byrne
c148ad90f0 Fix javadoc 2017-04-24 16:09:39 -05:00
Allen Byrne
bce204f7f3 Fix typo 2017-04-24 15:36:10 -05:00
Allen Byrne
c08ef4dc5b Signature change requires a ptr 2017-04-24 15:34:25 -05:00
Allen Byrne
c1dc24c143 Change H5PLsize() signature 2017-04-24 15:31:28 -05:00
Allen Byrne
c2a9c33444 Revert HDFFV-9655 2017-04-24 15:25:36 -05:00
Allen Byrne
aafee79e9f Changed signature of H5PLgetsize 2017-04-24 15:20:21 -05:00
Allen Byrne
6fac0de158 Revert HDFFV-9655 by disabling test and not using new function. 2017-04-24 15:10:58 -05:00
Allen Byrne
d9a69c592f Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '2deb953dbbde17712723529c4bca6a2bf3eedf6b':
  Fix for HDFFV-10166 h5watch tests fail randomly to match expected output files (1) Re-structure tests to do one "extend" action at a time (2) Re-try test till max limit before final failure
2017-04-24 15:09:52 -05:00
Vailin Choi
2deb953dbb Merge pull request #453 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit 'e9b289a3d1d031f594e8c5421144ac44f3d44bcb':
  Fix for HDFFV-10166 h5watch tests fail randomly to match expected output files (1) Re-structure tests to do one "extend" action at a time (2) Re-try test till max limit before final failure
2017-04-24 14:48:48 -05:00
Allen Byrne
220388e735 Fix path to actual executable location 2017-04-24 10:50:06 -05:00
Allen Byrne
0e1633c26d Windows ahs one more directory level 2017-04-24 09:03:46 -05:00
Larry Knox
0ee3d2ad9b Merge pull request #454 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'ebb7bc7fadb86c48869439ea9137f1dfc1e1f158':
  Comment out failing plugin test until fixed (unexpected .libs in plugin test directory path with '@').
2017-04-22 15:45:48 -05:00
lrknox
ebb7bc7fad Comment out failing plugin test until fixed (unexpected .libs in plugin test directory path with '@'). 2017-04-22 15:21:36 -05:00
Vailin Choi
e9b289a3d1 Fix for HDFFV-10166 h5watch tests fail randomly to match expected output files
(1) Re-structure tests to do one "extend" action at a time
(2) Re-try test till max limit before final failure
2017-04-21 18:42:17 -05:00
Larry Knox
3750e8ac7c Merge pull request #449 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '7bd516f2ead21e8470cc25c0b664ad6b56c723a0':
  Our best effort to build dynamic plugin tests and not install them with "make install".  It seems the install-exec-hook doesn't remove the last to be installed.
  Add targets for plugin test libraries to avoid linking to external libs.
2017-04-21 15:32:13 -05:00
Allen Byrne
e2bf6e2beb Merge pull request #447 in HDFFV/hdf5 from ~BYRN/hdf5_adb:bugfix/HDFFV-9655-plugin-path-relative to develop
* commit 'a995a63085d88e1a633770536efeff5b01569445':
  HDFFV-9655 fix test and some warnings
  HDFFV-9655 fix compile and test
  HDFFV-9655 - Add functions for '@' - untested
2017-04-21 14:40:37 -05:00
Allen Byrne
1f2a08041b Merge pull request #452 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'abdb412d50bcdfc158e6efddc9eb4aba4f8bce1e':
  file already in list
  Fix parameter form
2017-04-21 14:36:09 -05:00
lrknox
7bd516f2ea Our best effort to build dynamic plugin tests and not install them with
"make install".  It seems the install-exec-hook doesn't remove the last
to be installed.
2017-04-21 14:32:45 -05:00
Dana Robinson
0afef681c5 Merge pull request #451 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit 'b96db2f074c69d95f66917822ffb359a8e401cc7':
  Fixed problems that prevent bin/trace from marking up some functions.
2017-04-21 11:13:41 -05:00
Allen Byrne
abdb412d50 file already in list 2017-04-21 11:04:27 -05:00
Allen Byrne
a995a63085 HDFFV-9655 fix test and some warnings 2017-04-21 10:58:32 -05:00
Allen Byrne
aeb1500897 Merge remote-tracking branch 'origin/develop' into
bugfix/HDFFV-9655-plugin-path-relative
2017-04-21 10:41:50 -05:00
Allen Byrne
3968c5c3bf Fix parameter form 2017-04-21 10:07:30 -05:00
Allen Byrne
ae1144f882 HDFFV-9655 fix compile and test 2017-04-21 10:02:43 -05:00
Dana Robinson
b96db2f074 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into develop 2017-04-20 20:20:03 -04:00
Dana Robinson
739f413b78 Fixed problems that prevent bin/trace from marking up some functions. 2017-04-20 20:19:15 -04:00
lrknox
6ef69b7b17 Add targets for plugin test libraries to avoid linking to external libs. 2017-04-20 16:51:21 -05:00
Allen Byrne
4a70b0d7dc Merge pull request #448 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '9a7b106d3776a8454b5cb9443f11aae2873cc617':
  Correct test options to match autotools script
  Updates to CMake for the changes in the autotools script
2017-04-20 15:49:20 -05:00
Dana Robinson
5fefc12bd8 Merge pull request #443 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:eoc_parallel_prevent to develop
* commit '5ed622b9ca432f1b440e8903680695ac83e28301':
  The cache_image test shows a skipped message about EoC in parallel.
  Added code to disable the evict-on-close feature in the parallel library.
2017-04-20 15:33:09 -05:00
Dana Robinson
5ed622b9ca The cache_image test shows a skipped message about EoC in parallel. 2017-04-20 16:11:47 -04:00
Allen Byrne
9a7b106d37 Correct test options to match autotools script 2017-04-20 14:57:36 -05:00
Dana Robinson
b17aea2338 Merge branch 'develop' into eoc_parallel_prevent 2017-04-20 15:37:30 -04:00
Allen Byrne
7ee229bced Updates to CMake for the changes in the autotools script 2017-04-20 13:45:35 -05:00
Allen Byrne
05628b4687 Merge pull request #444 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'ea46fbe7c2bb3a8c8972c880f3609be20036d741':
  Correct typo of file name
2017-04-20 13:43:41 -05:00