diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2021-10-14 13:30:49 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2021-10-14 13:30:49 (GMT) |
commit | 3c7e11c034b8646d67380789a827709347f45754 (patch) | |
tree | 8c997eb2042534f7017e626689488d6b02a5ff90 /utils | |
parent | 03a42d466557f7e1f483d62eb1b1b9f91babb09f (diff) | |
download | hdf5-3c7e11c034b8646d67380789a827709347f45754.zip hdf5-3c7e11c034b8646d67380789a827709347f45754.tar.gz hdf5-3c7e11c034b8646d67380789a827709347f45754.tar.bz2 |
Reverts rename of SWMR VFD check program, which causes CMake issues
Diffstat (limited to 'utils')
-rw-r--r-- | utils/CMakeLists.txt | 25 | ||||
-rw-r--r-- | utils/Makefile.am | 2 | ||||
-rw-r--r-- | utils/swmr_compat_vfd.c | 53 |
3 files changed, 1 insertions, 79 deletions
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index b79191f..5fddf90 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -4,31 +4,6 @@ project (HDF5_UTILS C) add_subdirectory (mirror_vfd) #----------------------------------------------------------------------------- -# Add the swmr_compat_vfd executable -#----------------------------------------------------------------------------- - -set (swmr_compat_vfd_SOURCES ${HDF5_UTILS_SOURCE_DIR}/swmr_compat_vfd.c) -add_executable (swmr_compat_vfd ${swmr_compat_vfd_SOURCES}) -target_include_directories (swmr_compat_vfd PRIVATE "${HDF5_UTILS_DIR};${HDF5_SRC_DIR};${HDF5_TEST_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") -if (NOT BUILD_SHARED_LIBS) - TARGET_C_PROPERTIES (swmr_compat_vfd STATIC) - target_link_libraries (swmr_compat_vfd PRIVATE ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) -else () - TARGET_C_PROPERTIES (swmr_compat_vfd SHARED) - target_link_libraries (swmr_compat_vfd PRIVATE ${HDF5_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET}) -endif () -set_target_properties (swmr_compat_vfd PROPERTIES FOLDER utils) -set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};swmr_compat_vfd") -set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} swmr_compat_vfd) - -#----------------------------------------------------------------------------- -# Add Target to clang-format -#----------------------------------------------------------------------------- -if (HDF5_ENABLE_FORMATTERS) - clang_format (HDF5_UTILS_FORMAT swmr_compat_vfd) -endif () - -#----------------------------------------------------------------------------- # Add the vds_elink_compat_vol executable #----------------------------------------------------------------------------- diff --git a/utils/Makefile.am b/utils/Makefile.am index 0f66c89..9185457 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -25,7 +25,7 @@ SUBDIRS=mirror_vfd AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/test -noinst_PROGRAMS = vds_elink_compat_vol swmr_compat_vfd +bin_PROGRAMS = vds_elink_compat_vol # All programs depend on the hdf5 library LDADD=$(LIBH5TEST) $(LIBHDF5) diff --git a/utils/swmr_compat_vfd.c b/utils/swmr_compat_vfd.c deleted file mode 100644 index 720c747..0000000 --- a/utils/swmr_compat_vfd.c +++ /dev/null @@ -1,53 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the COPYING file, which can be found at the root of the source code * - * distribution tree, or in https://www.hdfgroup.org/licenses. * - * If you do not have access to either file, you may request a copy from * - * help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* Purpose: This is a small program that checks if the HDF5_DRIVER - * environment variable is set to a value that supports SWMR. - * - * It is intended for use in shell scripts. - */ - -#include "h5test.h" - -/* This file needs to access the file driver testing code */ -#define H5FD_FRIEND /*suppress error about including H5FDpkg */ -#define H5FD_TESTING -#include "H5FDpkg.h" /* File drivers */ - -/*------------------------------------------------------------------------- - * Function: main - * - * Purpose: Inspects the HDF5_DRIVER environment variable, which - * determines the VFD that the test harness will use with - * the majority of the tests. - * - * Return: VFD supports SWMR: EXIT_SUCCESS - * - * VFD does not support SWMR - * or failure: EXIT_FAILURE - * - *------------------------------------------------------------------------- - */ -int -main(void) -{ - char *driver = NULL; - - driver = HDgetenv(HDF5_DRIVER); - - if (H5FD__supports_swmr_test(driver)) - return EXIT_SUCCESS; - else - return EXIT_FAILURE; - -} /* end main() */ |