diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2020-10-14 17:45:53 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2020-10-14 17:45:53 (GMT) |
commit | 16fbbfb766c27e180ec94b2b295002e09d96a926 (patch) | |
tree | 3bc5073db0c97d83c0ed394857920040b59dcf79 /test | |
parent | 0698d232698bb7f515242fc5eb9fce6728626bbc (diff) | |
download | hdf5-16fbbfb766c27e180ec94b2b295002e09d96a926.zip hdf5-16fbbfb766c27e180ec94b2b295002e09d96a926.tar.gz hdf5-16fbbfb766c27e180ec94b2b295002e09d96a926.tar.bz2 |
Updates CMake files to work with VFD SWMR
- CMake files were updated to build new files in src and test.
- As with legacy SWMR, the test programs that are run via shell
scripts are built but not run.
- Updated whitespace in the links_env output file. It's unclear why
this changed, but CMake does an exact diff on the file whereas
the autotools do not.
Diffstat (limited to 'test')
-rw-r--r-- | test/CMakeLists.txt | 20 | ||||
-rw-r--r-- | test/testfiles/links_env.out | 4 |
2 files changed, 20 insertions, 4 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7e01d06..023c07e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -16,8 +16,8 @@ set (TEST_LIB_SOURCES ${HDF5_TEST_SOURCE_DIR}/cache_common.c ${HDF5_TEST_SOURCE_DIR}/external_common.c ${HDF5_TEST_SOURCE_DIR}/swmr_common.c + ${HDF5_TEST_SOURCE_DIR}/stubs.c ${HDF5_TEST_SOURCE_DIR}/vfd_swmr_common.c - ${HDF5_TEST_SOURCE_DIR}/vds_swmr_common.c ) set (TEST_LIB_HEADERS @@ -219,6 +219,16 @@ set(mirror_vfd_SOURCES ${HDF5_TEST_SOURCE_DIR}/genall5.c ) +set(vfd_swmr_zoo_reader_SOURCES + ${HDF5_TEST_SOURCE_DIR}/vfd_swmr_zoo_reader.c + ${HDF5_TEST_SOURCE_DIR}/genall5.c +) + +set(vfd_swmr_zoo_writer_SOURCES + ${HDF5_TEST_SOURCE_DIR}/vfd_swmr_zoo_writer.c + ${HDF5_TEST_SOURCE_DIR}/genall5.c +) + set (ttsafe_SOURCES ${HDF5_TEST_SOURCE_DIR}/ttsafe.c ${HDF5_TEST_SOURCE_DIR}/ttsafe_dcreate.c @@ -298,6 +308,7 @@ set (H5_TESTS cork swmr thread_id # special link + vfd_swmr vol timer ) @@ -504,12 +515,17 @@ foreach (h5_test ${H5_VDS_SWMR_TESTS}) endforeach () set (H5_VFD_SWMR_TESTS - vds_swmr_addrem_writer + vfd_swmr_addrem_writer + vfd_swmr_bigset_writer vfd_swmr_generator + vfd_swmr_group_writer vfd_swmr_reader vfd_swmr_remove_reader vfd_swmr_remove_writer + vfd_swmr_sparse_reader vfd_swmr_sparse_writer + vfd_swmr_vlstr_reader + vfd_swmr_vlstr_writer vfd_swmr_writer ) diff --git a/test/testfiles/links_env.out b/test/testfiles/links_env.out index 3f10fc6..b9a9893 100644 --- a/test/testfiles/links_env.out +++ b/test/testfiles/links_env.out @@ -1,3 +1,3 @@ -Testing external links via environment variable PASSED -Testing external links via environment variable (w/new group format) PASSED +Testing external links via environment variable PASSED +Testing external links via environment variable (w/new group format) PASSED All external Link (HDF5_EXT_PREFIX) tests passed. |