Skip to content

Commit

Permalink
Makes the event_set test a single-source target (#690)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
derobins and github-actions[bot] authored May 27, 2021
1 parent ee9d6f5 commit dedba0f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 20 deletions.
20 changes: 1 addition & 19 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -336,7 +332,7 @@ set (H5_TESTS
vol
timer
cmpd_dtransform
event_set # multiple source
event_set
)

macro (ADD_H5_EXE file)
Expand Down Expand Up @@ -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})
Expand Down Expand Up @@ -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
#-----------------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion test/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit dedba0f

Please sign in to comment.