diff options
| author | lrknox <lrknox> | 2018-03-14 20:42:58 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2018-03-14 20:42:58 (GMT) |
| commit | 82f0bd089c5288222ac09fc0c0d02f546e72b07b (patch) | |
| tree | 7e4c0a6bf69dc47cea982e9f1f7016a915c73825 | |
| parent | d75948e15e94a0d33cb68b81856f4b44734bae2a (diff) | |
| parent | ff569918f035676264bd50ee15a083c8feeadf8e (diff) | |
| download | hdf5-82f0bd089c5288222ac09fc0c0d02f546e72b07b.zip hdf5-82f0bd089c5288222ac09fc0c0d02f546e72b07b.tar.gz hdf5-82f0bd089c5288222ac09fc0c0d02f546e72b07b.tar.bz2 | |
Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into hdf5_1_10
Resolved RELEASE.txt conflicts.
| -rw-r--r-- | release_docs/RELEASE.txt | 4 | ||||
| -rw-r--r-- | testpar/CMakeTests.cmake | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 172e36b..34a734e 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -938,8 +938,8 @@ Bug Fixes since HDF5-1.10.1 release Testing ------- - - Memory for three variables in testphdf5's coll_write_test was malloced - but not freed, leaking memory when running the test. The variables' + - Memory for three variables in testphdf5's coll_write_test was malloced + but not freed, leaking memory when running the test. The variables' memory is now freed. (LRK - 2018/03/12, HDFFV-10397) diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake index cd9acda..87470f3 100644 --- a/testpar/CMakeTests.cmake +++ b/testpar/CMakeTests.cmake @@ -18,10 +18,6 @@ add_test (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS}) -if (WIN32) - # t_cache_imagee uses fork() and execve(), will not run on Windows - list (REMOVE_ITEM H5P_TESTS t_cache_image) -endif () foreach (testp ${H5P_TESTS}) add_test (NAME TEST_PAR_${testp} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:${testp}> ${MPIEXEC_POSTFLAGS}) endforeach () |