summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-07-26 16:02:55 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-07-26 16:02:55 (GMT)
commit634cc5f99d3e46ff615f003087d0a38d9a843898 (patch)
treed03a462db2321bc0bf02fa23f1160704eb7d1bd7 /tools
parent8540b1d8fcfb188303c34f68f72d69df22518d54 (diff)
parent55d82c8f747b3a817a4a0b6b12e506b9c2dc0878 (diff)
downloadhdf5-634cc5f99d3e46ff615f003087d0a38d9a843898.zip
hdf5-634cc5f99d3e46ff615f003087d0a38d9a843898.tar.gz
hdf5-634cc5f99d3e46ff615f003087d0a38d9a843898.tar.bz2
Merge pull request #613 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '55d82c8f747b3a817a4a0b6b12e506b9c2dc0878': Add test header for log Verify default paths exist in table Make sure zip_perf program does not run concurrently
Diffstat (limited to 'tools')
-rw-r--r--tools/test/perform/CMakeTests.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/test/perform/CMakeTests.cmake b/tools/test/perform/CMakeTests.cmake
index 2933563..39faa73 100644
--- a/tools/test/perform/CMakeTests.cmake
+++ b/tools/test/perform/CMakeTests.cmake
@@ -146,6 +146,7 @@ else ()
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
+set_tests_properties (PERFORM_zip_perf PROPERTIES DEPENDS PERFORM_zip_perf_help)
if (H5_HAVE_PARALLEL)
add_test (NAME PERFORM_h5perf COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:h5perf>)