summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <43805+derobins@users.noreply.github.com>2021-05-27 14:33:46 (GMT)
committerGitHub <noreply@github.com>2021-05-27 14:33:46 (GMT)
commitdedba0f9476418ca3c9e06c626e7e3088179c632 (patch)
treeb88c4d83ed78d1e1ac405e8db03ae48e14fa8d84
parentee9d6f514ac163e4739440ab4b0ec70d59a0f7ce (diff)
downloadhdf5-dedba0f9476418ca3c9e06c626e7e3088179c632.zip
hdf5-dedba0f9476418ca3c9e06c626e7e3088179c632.tar.gz
hdf5-dedba0f9476418ca3c9e06c626e7e3088179c632.tar.bz2
Makes the event_set test a single-source target (#690)
* Committing clang-format changes * Makes the event_set test a single-source target Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
-rw-r--r--test/CMakeLists.txt20
-rw-r--r--test/Makefile.am1
2 files changed, 1 insertions, 20 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f0d0d8a..56427f5 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -259,10 +259,6 @@ set (ttsafe_SOURCES
${HDF5_TEST_SOURCE_DIR}/ttsafe_attr_vlen.c
)
-set (event_set_SOURCES
- ${HDF5_TEST_SOURCE_DIR}/event_set.c
-)
-
set (H5_TESTS
testhdf5 # multiple source
cache
@@ -336,7 +332,7 @@ set (H5_TESTS
vol
timer
cmpd_dtransform
- event_set # multiple source
+ event_set
)
macro (ADD_H5_EXE file)
@@ -368,7 +364,6 @@ set (H5_TESTS_MULTIPLE
ttsafe
thread_id # special link
mirror_vfd
- event_set
)
# Only build single source tests here
foreach (h5_test ${H5_TESTS})
@@ -532,19 +527,6 @@ if (HDF5_ENABLE_FORMATTERS)
clang_format (HDF5_TEST_mirror_vfd_FORMAT mirror_vfd)
endif ()
-#-- Adding test for event_set
-add_executable (event_set ${event_set_SOURCES})
-target_compile_options(event_set PRIVATE "${HDF5_CMAKE_C_FLAGS}")
-target_include_directories (event_set PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-if (NOT BUILD_SHARED_LIBS)
- TARGET_C_PROPERTIES (event_set STATIC)
- target_link_libraries (event_set PRIVATE ${HDF5_TEST_LIB_TARGET})
-else ()
- TARGET_C_PROPERTIES (event_set SHARED)
- target_link_libraries (event_set PRIVATE ${HDF5_TEST_LIBSH_TARGET})
-endif ()
-set_target_properties (event_set PROPERTIES FOLDER test)
-
#-----------------------------------------------------------------------------
# Add Target to clang-format
#-----------------------------------------------------------------------------
diff --git a/test/Makefile.am b/test/Makefile.am
index 5d07428..4bf9620 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -150,7 +150,6 @@ ttsafe_SOURCES=ttsafe.c ttsafe_dcreate.c ttsafe_error.c ttsafe_cancel.c \
ttsafe_acreate.c ttsafe_attr_vlen.c
cache_image_SOURCES=cache_image.c genall5.c
mirror_vfd_SOURCES=mirror_vfd.c genall5.c
-event_set_SOURCES=event_set.c
# Additional target for running timing test
timings _timings: testmeta