From 6d1bae4de958869b218d37c772f9859fb32732ca Mon Sep 17 00:00:00 2001 From: Kyle Shores Date: Mon, 18 Mar 2024 15:35:42 -0500 Subject: [PATCH] Replace ENABLE_EXTERNAL_SERVER_TESTS with NETCDF_ENABLE_EXTERNAL_SERVER_TESTS --- CMakeLists.txt | 6 +++--- configure.ac | 4 ++-- nc_test/CMakeLists.txt | 2 +- nc_test/Makefile.am | 2 +- ncdap_test/CMakeLists.txt | 2 +- ncdap_test/Makefile.am | 2 +- nczarr_test/Makefile.am | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cb9b938ce..8f0a0dd10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -545,12 +545,12 @@ endif() # Option to Enable DAP long tests, remote tests. option(NETCDF_ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." ON) -option(ENABLE_EXTERNAL_SERVER_TESTS "Enable external Server remote tests." OFF) +option(NETCDF_ENABLE_EXTERNAL_SERVER_TESTS "Enable external Server remote tests." OFF) option(NETCDF_ENABLE_DAP_LONG_TESTS "Enable DAP long tests." OFF) if(NOT NETCDF_ENABLE_DAP) set(NETCDF_ENABLE_DAP_REMOTE_TESTS OFF CACHE BOOL "" FORCE) -set(ENABLE_EXTERNAL_SERVER_TESTS OFF CACHE BOOL "" FORCE) +set(NETCDF_ENABLE_EXTERNAL_SERVER_TESTS OFF CACHE BOOL "" FORCE) set(NETCDF_ENABLE_DAP_LONG_TESTS OFF CACHE BOOL "" FORCE) endif() @@ -1082,7 +1082,7 @@ endif() # Set some of the options as advanced. MARK_AS_ADVANCED(ENABLE_INTERNAL_DOCS VALGRIND_TESTS NETCDF_ENABLE_COVERAGE_TESTS ) -MARK_AS_ADVANCED(NETCDF_ENABLE_DAP_REMOTE_TESTS NETCDF_ENABLE_DAP_LONG_TESTS USE_REMOTE_CDASH ENABLE_EXTERNAL_SERVER_TESTS) +MARK_AS_ADVANCED(NETCDF_ENABLE_DAP_REMOTE_TESTS NETCDF_ENABLE_DAP_LONG_TESTS USE_REMOTE_CDASH NETCDF_ENABLE_EXTERNAL_SERVER_TESTS) MARK_AS_ADVANCED(NETCDF_ENABLE_DOXYGEN_BUILD_RELEASE_DOCS NETCDF_DOXYGEN_ENABLE_TASKS NETCDF_ENABLE_DOXYGEN_SERVER_SIDE_SEARCH) MARK_AS_ADVANCED(ENABLE_SHARED_LIBRARY_VERSION) diff --git a/configure.ac b/configure.ac index 07196b1ce..9de3da702 100644 --- a/configure.ac +++ b/configure.ac @@ -689,7 +689,7 @@ if test "x$enable_dap_remote_tests" = xyes; then AC_DEFINE([NETCDF_ENABLE_DAP_REMOTE_TESTS], [1], [if true, do remote tests]) fi if test "x$enable_external_server_tests" = xyes; then - AC_DEFINE([ENABLE_EXTERNAL_SERVER_TESTS], [1], [if true, do remote external tests]) + AC_DEFINE([NETCDF_ENABLE_EXTERNAL_SERVER_TESTS], [1], [if true, do remote external tests]) fi AC_MSG_CHECKING([whether the time-consuming dap tests should be enabled (default off)]) @@ -1909,7 +1909,7 @@ AM_CONDITIONAL(NETCDF_ENABLE_DAP4, [test "x$enable_dap4" = xyes]) AM_CONDITIONAL(USE_STRICT_NULL_BYTE_HEADER_PADDING, [test x$enable_strict_null_byte_header_padding = xyes]) AM_CONDITIONAL(NETCDF_ENABLE_CDF5, [test "x$enable_cdf5" = xyes]) AM_CONDITIONAL(NETCDF_ENABLE_DAP_REMOTE_TESTS, [test "x$enable_dap_remote_tests" = xyes]) -AM_CONDITIONAL(ENABLE_EXTERNAL_SERVER_TESTS, [test "x$enable_external_server_tests" = xyes]) +AM_CONDITIONAL(NETCDF_ENABLE_EXTERNAL_SERVER_TESTS, [test "x$enable_external_server_tests" = xyes]) AM_CONDITIONAL(NETCDF_ENABLE_DAP_AUTH_TESTS, [test "x$enable_dap_auth_tests" = xyes]) AM_CONDITIONAL(NETCDF_ENABLE_DAP_LONG_TESTS, [test "x$enable_dap_long_tests" = xyes]) AM_CONDITIONAL(USE_PNETCDF_DIR, [test ! "x$PNETCDFDIR" = x]) diff --git a/nc_test/CMakeLists.txt b/nc_test/CMakeLists.txt index d2eaa25ea..2bfb8ea62 100644 --- a/nc_test/CMakeLists.txt +++ b/nc_test/CMakeLists.txt @@ -119,7 +119,7 @@ IF(NETCDF_BUILD_UTILITIES) ENDIF() IF(NETCDF_ENABLE_BYTERANGE) - IF(ENABLE_EXTERNAL_SERVER_TESTS) + IF(NETCDF_ENABLE_EXTERNAL_SERVER_TESTS) build_bin_test_no_prefix(tst_byterange) add_sh_test(nc_test test_byterange) ENDIF() diff --git a/nc_test/Makefile.am b/nc_test/Makefile.am index e64b4bff8..903e74351 100644 --- a/nc_test/Makefile.am +++ b/nc_test/Makefile.am @@ -78,7 +78,7 @@ TESTS = $(TESTPROGRAMS) if NETCDF_BUILD_UTILITIES if NETCDF_ENABLE_BYTERANGE -if ENABLE_EXTERNAL_SERVER_TESTS +if NETCDF_ENABLE_EXTERNAL_SERVER_TESTS tst_byterange_SOURCES = tst_byterange.c check_PROGRAMS += tst_byterange TESTS += test_byterange.sh diff --git a/ncdap_test/CMakeLists.txt b/ncdap_test/CMakeLists.txt index 17aa0ab55..c2f3d11ee 100644 --- a/ncdap_test/CMakeLists.txt +++ b/ncdap_test/CMakeLists.txt @@ -60,7 +60,7 @@ IF(ENABLE_TESTS) add_sh_test(ncdap tst_hyrax) ENDIF() ENDIF(NETCDF_BUILD_UTILITIES) - IF(ENABLE_EXTERNAL_SERVER_TESTS) + IF(NETCDF_ENABLE_EXTERNAL_SERVER_TESTS) add_bin_test(ncdap test_manyurls) SET_TESTS_PROPERTIES(ncdap_test_manyurls PROPERTIES RUN_SERIAL TRUE) ENDIF() diff --git a/ncdap_test/Makefile.am b/ncdap_test/Makefile.am index 14f4cc956..d7576677a 100644 --- a/ncdap_test/Makefile.am +++ b/ncdap_test/Makefile.am @@ -58,7 +58,7 @@ TESTS += test_partvar if NETCDF_ENABLE_DAP_LONG_TESTS TESTS += tst_longremote3.sh tst_longremote3.log: tst_remote3.log -if ENABLE_EXTERNAL_SERVER_TESTS +if NETCDF_ENABLE_EXTERNAL_SERVER_TESTS test_manyurls_SOURCES = test_manyurls.c manyurls.h check_PROGRAMS += test_manyurls test_manyurls.log: tst_longremote3.log diff --git a/nczarr_test/Makefile.am b/nczarr_test/Makefile.am index f48de73df..056d0afd4 100644 --- a/nczarr_test/Makefile.am +++ b/nczarr_test/Makefile.am @@ -77,7 +77,7 @@ TESTS += run_scalar.sh TESTS += run_nulls.sh TESTS += run_notzarr.sh -if ENABLE_EXTERNAL_SERVER_TESTS +if NETCDF_ENABLE_EXTERNAL_SERVER_TESTS TESTS += run_external.sh endif