summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-10-26 15:49:05 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-10-26 15:49:05 (GMT)
commit7bfab2c15371f666fc7238a5ce246a507ab722d5 (patch)
tree27ddcc623f1eec7212b0a709ba8b53304e82a37c
parentccc8c6f05d7b8ca9cc713e88d660a51264ef802d (diff)
parentfb3ce2f3a1d72fd2b36aaf5c17c884ac673a1dda (diff)
downloadhdf5-7bfab2c15371f666fc7238a5ce246a507ab722d5.zip
hdf5-7bfab2c15371f666fc7238a5ce246a507ab722d5.tar.gz
hdf5-7bfab2c15371f666fc7238a5ce246a507ab722d5.tar.bz2
Merge pull request #728 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8 to hdf5_1_8
* commit 'fb3ce2f3a1d72fd2b36aaf5c17c884ac673a1dda': HDFFV-10297 fix grammar HDFFV-10297 - clarify note. HDFFV-10297 Update release note Fix test DEPENDS
-rw-r--r--release_docs/RELEASE.txt6
-rw-r--r--tools/perform/CMakeTests.cmake3
2 files changed, 6 insertions, 3 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 061d1d8..66633d7 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -178,7 +178,7 @@ Bug Fixes since HDF5-1.8.19
block size.
(2) Fix other places in the library that call this routine to detect
error routine.
-
+
(HDFFV-10216, VC, 2017/09/05)
@@ -203,6 +203,10 @@ Bug Fixes since HDF5-1.8.19
Modified H5Zfilter_avail and private function, H5Z_filter_avail.
Moved check for plugin from public to private function. Updated
H5P__set_filter due to change in H5Z_filter_avail. Updated tests.
+ Note, h5repack output display has changed to clarify the individual
+ steps of the repack process. The output indicates if an operation
+ applies to all objects. Lines with notation and no information
+ have been removed.
(ADB - 2017/10/10, HDFFV-10297)
diff --git a/tools/perform/CMakeTests.cmake b/tools/perform/CMakeTests.cmake
index 2bd8d46..1f67abe 100644
--- a/tools/perform/CMakeTests.cmake
+++ b/tools/perform/CMakeTests.cmake
@@ -167,8 +167,7 @@ else ()
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
-set_tests_properties (PERFORM_zip_perf PROPERTIES DEPENDS PERFORM_zip_perf_help)
-set_tests_properties (PERFORM_zip_perf PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
+set_tests_properties (PERFORM_zip_perf PROPERTIES DEPENDS "PERFORM_zip_perf_help;PERFORM_h5perform-clearall-objects")
if (H5_HAVE_PARALLEL)
add_test (NAME PERFORM_h5perf COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:h5perf>)