mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-27 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace ENABLE_FILTER_TESTING with NETCDF_ENABLE_FILTER_TESTING

Browse Source
This commit is contained in:
Kyle Shores 2024-03-18 15:36:24 -05:00
parent 0be7d60580
commit 0535edd9c1
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -964,18 +964,18 @@ IF (ENABLE_PARALLEL_TESTS AND NOT USE_PARALLEL)
endif()
# Enable special filter test; experimental when using cmake.
option(ENABLE_FILTER_TESTING "Enable filter testing. Ignored if shared libraries or netCDF4 are not enabled" ${ENABLE_PLUGINS})
option(NETCDF_ENABLE_FILTER_TESTING "Enable filter testing. Ignored if shared libraries or netCDF4 are not enabled" ${ENABLE_PLUGINS})
if(ENABLE_FILTER_TESTING)
if(NETCDF_ENABLE_FILTER_TESTING)
if(NOT ENABLE_HDF5 AND NOT ENABLE_NCZARR)
message(WARNING "ENABLE_FILTER_TESTING requires HDF5 and/or NCZarr. Disabling.")
set(ENABLE_FILTER_TESTING OFF CACHE BOOL "Enable Filter Testing" FORCE)
message(WARNING "NETCDF_ENABLE_FILTER_TESTING requires HDF5 and/or NCZarr. Disabling.")
set(NETCDF_ENABLE_FILTER_TESTING OFF CACHE BOOL "Enable Filter Testing" FORCE)
endif()
endif()
if(NOT BUILD_SHARED_LIBS)
message(WARNING "ENABLE_FILTER_TESTING requires shared libraries. Disabling.")
set(ENABLE_FILTER_TESTING OFF)
message(WARNING "NETCDF_ENABLE_FILTER_TESTING requires shared libraries. Disabling.")
set(NETCDF_ENABLE_FILTER_TESTING OFF)
endif()
option(ENABLE_NCZARR_FILTERS "Enable NCZarr filters" ${ENABLE_PLUGINS})
@ -1648,7 +1648,7 @@ is_enabled(ENABLE_NCZARR_ZIP HAS_NCZARR_ZIP)
is_enabled(ENABLE_NCZARR_ZIP DO_NCZARR_ZIP_TESTS)
is_enabled(ENABLE_QUANTIZE HAS_QUANTIZE)
is_enabled(ENABLE_LOGGING HAS_LOGGING)
is_enabled(ENABLE_FILTER_TESTING DO_FILTER_TESTS)
is_enabled(NETCDF_ENABLE_FILTER_TESTING DO_FILTER_TESTS)
is_enabled(HAVE_SZ HAS_SZIP)
is_enabled(HAVE_SZ HAS_SZLIB_WRITE)
is_enabled(HAVE_ZSTD HAS_ZSTD)

2
appveyor.yml
View File

@ -36,7 +36,7 @@ build: off
build_script:
- cmd: mkdir build
- cmd: cd build
- cmd: cmake .. -G "%CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%INSTALL_LOC% -DNETCDF_ENABLE_BASH_SCRIPT_TESTING=OFF -DENABLE_FILTER_TESTING=OFF -DNETCDF_ENABLE_BYTERANGE=ON
- cmd: cmake .. -G "%CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%INSTALL_LOC% -DNETCDF_ENABLE_BASH_SCRIPT_TESTING=OFF -DNETCDF_ENABLE_FILTER_TESTING=OFF -DNETCDF_ENABLE_BYTERANGE=ON
- cmd: if errorlevel 1 exit 1
- cmd: cmake --build . --config Release -- /maxcpucount:4

2
configure.ac
View File

@ -1894,7 +1894,7 @@ fi
enable_clientside_filters=no
AM_CONDITIONAL(ENABLE_CLIENTSIDE_FILTERS, [test x$enable_clientside_filters = xyes])
AM_CONDITIONAL(ENABLE_FILTER_TESTING, [test x$enable_filter_testing = xyes])
AM_CONDITIONAL(NETCDF_ENABLE_FILTER_TESTING, [test x$enable_filter_testing = xyes])
AM_CONDITIONAL(ENABLE_NCZARR_FILTERS, [test x$enable_nczarr_filters = xyes])
# Automake conditionals need to be called, whether the answer is yes

2
examples/C/Makefile.am
View File

@ -36,7 +36,7 @@ simple_xy_nc4_rd
TESTS += run_examples4.sh
if NETCDF_BUILD_UTILITIES
if ENABLE_FILTER_TESTING
if NETCDF_ENABLE_FILTER_TESTING
# filter_example.c should be same as nc_test4/test_filter.c
check_PROGRAMS += filter_example
TESTS += run_filter.sh

4
nc_test4/CMakeLists.txt
View File

@ -41,7 +41,7 @@ IF(NETCDF_BUILD_UTILITIES)
build_bin_test(tst_fillonly)
ADD_SH_TEST(nc_test4 test_fillonly)
ADD_SH_TEST(nc_test4 tst_fixedstring)
IF(USE_HDF5 AND ENABLE_FILTER_TESTING)
IF(USE_HDF5 AND NETCDF_ENABLE_FILTER_TESTING)
build_bin_test(tst_filterparser)
build_bin_test(test_filter)
build_bin_test(test_filter_misc)
@ -63,7 +63,7 @@ IF(USE_HDF5 AND ENABLE_FILTER_TESTING)
# manually invoked if desired
ADD_SH_TEST(nc_test4 tst_filterinstall)
ENDIF(FALSE)
ENDIF(USE_HDF5 AND ENABLE_FILTER_TESTING)
ENDIF(USE_HDF5 AND NETCDF_ENABLE_FILTER_TESTING)
ENDIF(NETCDF_BUILD_UTILITIES)

4
nc_test4/Makefile.am
View File

@ -79,7 +79,7 @@ endif
# Filter Tests (requires ncdump and ncgen and HDF5)
if USE_HDF5
if ENABLE_FILTER_TESTING
if NETCDF_ENABLE_FILTER_TESTING
extradir =
check_PROGRAMS += test_filter test_filter_misc test_filter_order test_filter_repeat
check_PROGRAMS += tst_multifilter tst_filter_vlen
@ -107,7 +107,7 @@ if AX_MANUAL
TESTS += tst_filterinstall.sh
endif
endif # ENABLE_FILTER_TESTING
endif # NETCDF_ENABLE_FILTER_TESTING
endif # USE_HDF5
endif # NETCDF_BUILD_UTILITIES

4
nczarr_test/CMakeLists.txt
View File

@ -201,7 +201,7 @@ IF(ENABLE_TESTS)
ENDIF()
IF(ENABLE_NCZARR_FILTERS)
IF(ENABLE_FILTER_TESTING)
IF(NETCDF_ENABLE_FILTER_TESTING)
build_bin_test(test_nczfilter)
build_bin_test(test_filter_vlen)
build_bin_test(testfilter)
@ -218,7 +218,7 @@ IF(ENABLE_TESTS)
# It causes race conditions. So suppress and only test by hand.
ADD_SH_TEST(nczarr_test run_unknown)
ENDIF(FALSE)
ENDIF(ENABLE_FILTER_TESTING)
ENDIF(NETCDF_ENABLE_FILTER_TESTING)
ENDIF(ENABLE_NCZARR_FILTERS)
if(ENABLE_NCZARR_ZIP)

4
nczarr_test/Makefile.am
View File

@ -137,7 +137,7 @@ endif
endif # BUILD_BENCHMARKS
if ENABLE_NCZARR_FILTERS
if ENABLE_FILTER_TESTING
if NETCDF_ENABLE_FILTER_TESTING
check_PROGRAMS += test_filter_avail test_filter_vlen
TESTS += run_filter_vlen.sh run_filter_misc.sh
@ -161,7 +161,7 @@ if ISMINGW
XFAIL_TESTS = run_filter.sh run_specific_filters.sh run_nczfilter.sh
endif # ISMINGW
endif #ENABLE_FILTER_TESTING
endif #NETCDF_ENABLE_FILTER_TESTING
endif #ENABLE_NCZARR_FILTERS
# Test various corrupted files

2
plugins/Makefile.am
View File

@ -94,7 +94,7 @@ lib__nch5noop1_la_SOURCES = H5Znoop1.c H5Zutil.c h5noop.h
lib__nch5noop_la_LDFLAGS = $(AM_LDFLAGS) ${RPATH}
lib__nch5noop1_la_LDFLAGS = $(AM_LDFLAGS) ${RPATH}
if ENABLE_FILTER_TESTING
if NETCDF_ENABLE_FILTER_TESTING
# The misc filter is to allow testing of filter arguments
lib__nch5misc_la_SOURCES = H5Zmisc.c H5Zutil.c h5misc.h
lib__nch5misc_la_LDFLAGS = ${top_builddir}/liblib/libnetcdf.la $(AM_LDFLAGS) ${RPATH}