diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2016-12-18 20:17:02 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2016-12-18 20:17:02 (GMT) |
| commit | ab3963b28e59419f8e857ec224dd4efa3ea6dd8e (patch) | |
| tree | bd1611376e49342df2dc4244879881fee178fbeb /test/CMakeLists.txt | |
| parent | 7f51c8862ea971db773d4c4b043d1bd216aed8fc (diff) | |
| parent | f8cfbee05e26a815134cd1f1fb0ad87d8d9b16dd (diff) | |
| download | hdf5-ab3963b28e59419f8e857ec224dd4efa3ea6dd8e.zip hdf5-ab3963b28e59419f8e857ec224dd4efa3ea6dd8e.tar.gz hdf5-ab3963b28e59419f8e857ec224dd4efa3ea6dd8e.tar.bz2 | |
Merge pull request #207 in HDFFV/hdf5 from ~KOZIOL/hdf5:develop_swmr_merge_06 to develop
* commit 'f8cfbee05e26a815134cd1f1fb0ad87d8d9b16dd':
Merge SWMR-related testing to existing tests.
Bring over tweak for missing environment variable.
Update CMake configuration files with SWMR accumulator changes.
Add missing accumulator test.
Merge SWMR-oriented accumulator tests from revise_chunks to develop.
Diffstat (limited to 'test/CMakeLists.txt')
| -rw-r--r-- | test/CMakeLists.txt | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 5a55616..0197524 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -196,7 +196,6 @@ MACRO (ADD_H5_EXE file) ENDMACRO (ADD_H5_EXE file) set (H5_TESTS - #testhdf5 cache cache_api cache_tagging @@ -211,7 +210,6 @@ set (H5_TESTS fheap pool accum - #hyperslab istore bittests dt_arith @@ -234,7 +232,6 @@ set (H5_TESTS app_ref enum set_extent - #ttsafe enc_dec_plist enc_dec_plist_cross_platform getname @@ -328,6 +325,21 @@ foreach (test ${H5_CHECK_TESTS}) ADD_H5_EXE(${test}) endforeach (test ${H5_CHECK_TESTS}) +#-- Adding test for accum_swmr_reader +# This has to be copied to the test directory for execve() to find it +# and it can't be renamed (i.e., no <foo>-shared). +add_executable (accum_swmr_reader ${HDF5_TEST_SOURCE_DIR}/accum_swmr_reader.c) +TARGET_NAMING (accum_swmr_reader STATIC) +TARGET_C_PROPERTIES (accum_swmr_reader STATIC " " " ") +target_link_libraries (accum_swmr_reader ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) +set_target_properties (accum_swmr_reader PROPERTIES FOLDER test) + +#-- Set accum dependencies +set_target_properties (accum PROPERTIES DEPENDS accum_swmr_reader) +if (BUILD_SHARED_LIBS) + set_target_properties (accum-shared PROPERTIES DEPENDS accum_swmr_reader) +endif (BUILD_SHARED_LIBS) + #-- Adding test for libinfo set (GREP_RUNNER ${PROJECT_BINARY_DIR}/GrepRunner.cmake) file (WRITE ${GREP_RUNNER} |