[build] fix exclusion of test in cmake

10 months ago · 3b3435ef11
parent 811bb258d8
commit 3b3435ef11
4 changed files with 2 additions and 213 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1540,7 +1540,6 @@ if(gRPC_BUILD_TESTS)
  add_dependencies(buildtests_cxx xds_audit_logger_registry_test)
  add_dependencies(buildtests_cxx xds_bootstrap_test)
  add_dependencies(buildtests_cxx xds_certificate_provider_test)
-  add_dependencies(buildtests_cxx xds_channel_stack_modifier_test)
  add_dependencies(buildtests_cxx xds_client_test)
  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
    add_dependencies(buildtests_cxx xds_cluster_end2end_test)
@ -33191,105 +33190,6 @@ target_link_libraries(xds_certificate_provider_test
 )


-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(xds_channel_stack_modifier_test
-  src/core/ext/filters/logging/logging_filter.cc
-  src/cpp/client/call_credentials.cc
-  src/cpp/client/channel_cc.cc
-  src/cpp/client/channel_credentials.cc
-  src/cpp/client/client_callback.cc
-  src/cpp/client/client_context.cc
-  src/cpp/client/client_interceptor.cc
-  src/cpp/client/client_stats_interceptor.cc
-  src/cpp/client/create_channel.cc
-  src/cpp/client/create_channel_internal.cc
-  src/cpp/client/create_channel_posix.cc
-  src/cpp/client/insecure_credentials.cc
-  src/cpp/client/secure_credentials.cc
-  src/cpp/common/alarm.cc
-  src/cpp/common/auth_property_iterator.cc
-  src/cpp/common/channel_arguments.cc
-  src/cpp/common/completion_queue_cc.cc
-  src/cpp/common/resource_quota_cc.cc
-  src/cpp/common/rpc_method.cc
-  src/cpp/common/secure_auth_context.cc
-  src/cpp/common/secure_create_auth_context.cc
-  src/cpp/common/tls_certificate_provider.cc
-  src/cpp/common/tls_certificate_verifier.cc
-  src/cpp/common/tls_credentials_options.cc
-  src/cpp/common/validate_service_config.cc
-  src/cpp/common/version_cc.cc
-  src/cpp/ext/filters/census/client_filter.cc
-  src/cpp/ext/filters/census/context.cc
-  src/cpp/ext/filters/census/grpc_plugin.cc
-  src/cpp/ext/filters/census/measures.cc
-  src/cpp/ext/filters/census/rpc_encoding.cc
-  src/cpp/ext/filters/census/server_call_tracer.cc
-  src/cpp/ext/filters/census/views.cc
-  src/cpp/server/async_generic_service.cc
-  src/cpp/server/backend_metric_recorder.cc
-  src/cpp/server/channel_argument_option.cc
-  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/external_connection_acceptor_impl.cc
-  src/cpp/server/health/default_health_check_service.cc
-  src/cpp/server/health/health_check_service.cc
-  src/cpp/server/health/health_check_service_server_builder_option.cc
-  src/cpp/server/insecure_server_credentials.cc
-  src/cpp/server/secure_server_credentials.cc
-  src/cpp/server/server_builder.cc
-  src/cpp/server/server_callback.cc
-  src/cpp/server/server_cc.cc
-  src/cpp/server/server_context.cc
-  src/cpp/server/server_credentials.cc
-  src/cpp/server/server_posix.cc
-  src/cpp/thread_manager/thread_manager.cc
-  src/cpp/util/byte_buffer_cc.cc
-  src/cpp/util/status.cc
-  src/cpp/util/string_ref.cc
-  src/cpp/util/time_cc.cc
-  test/core/server/xds_channel_stack_modifier_test.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(xds_channel_stack_modifier_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(xds_channel_stack_modifier_test PUBLIC cxx_std_14)
-target_include_directories(xds_channel_stack_modifier_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(xds_channel_stack_modifier_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  absl::endian
-  absl::int128
-  ${_gRPC_PROTOBUF_LIBRARIES}
-  grpc_test_util
-)
-
-
 endif()
 if(gRPC_BUILD_TESTS)

--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@ -20950,94 +20950,6 @@ targets:
  - gtest
  - grpc_test_util
  uses_polling: false
- name: xds_channel_stack_modifier_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/filters/logging/logging_filter.h
-  - src/core/ext/filters/logging/logging_sink.h
-  - src/cpp/client/client_stats_interceptor.h
-  - src/cpp/client/create_channel_internal.h
-  - src/cpp/client/secure_credentials.h
-  - src/cpp/common/secure_auth_context.h
-  - src/cpp/ext/filters/census/client_filter.h
-  - src/cpp/ext/filters/census/context.h
-  - src/cpp/ext/filters/census/grpc_plugin.h
-  - src/cpp/ext/filters/census/measures.h
-  - src/cpp/ext/filters/census/open_census_call_tracer.h
-  - src/cpp/ext/filters/census/rpc_encoding.h
-  - src/cpp/ext/filters/census/server_call_tracer.h
-  - src/cpp/server/backend_metric_recorder.h
-  - src/cpp/server/dynamic_thread_pool.h
-  - src/cpp/server/external_connection_acceptor_impl.h
-  - src/cpp/server/health/default_health_check_service.h
-  - src/cpp/server/secure_server_credentials.h
-  - src/cpp/server/thread_pool_interface.h
-  - src/cpp/thread_manager/thread_manager.h
-  src:
-  - src/core/ext/filters/logging/logging_filter.cc
-  - src/cpp/client/call_credentials.cc
-  - src/cpp/client/channel_cc.cc
-  - src/cpp/client/channel_credentials.cc
-  - src/cpp/client/client_callback.cc
-  - src/cpp/client/client_context.cc
-  - src/cpp/client/client_interceptor.cc
-  - src/cpp/client/client_stats_interceptor.cc
-  - src/cpp/client/create_channel.cc
-  - src/cpp/client/create_channel_internal.cc
-  - src/cpp/client/create_channel_posix.cc
-  - src/cpp/client/insecure_credentials.cc
-  - src/cpp/client/secure_credentials.cc
-  - src/cpp/common/alarm.cc
-  - src/cpp/common/auth_property_iterator.cc
-  - src/cpp/common/channel_arguments.cc
-  - src/cpp/common/completion_queue_cc.cc
-  - src/cpp/common/resource_quota_cc.cc
-  - src/cpp/common/rpc_method.cc
-  - src/cpp/common/secure_auth_context.cc
-  - src/cpp/common/secure_create_auth_context.cc
-  - src/cpp/common/tls_certificate_provider.cc
-  - src/cpp/common/tls_certificate_verifier.cc
-  - src/cpp/common/tls_credentials_options.cc
-  - src/cpp/common/validate_service_config.cc
-  - src/cpp/common/version_cc.cc
-  - src/cpp/ext/filters/census/client_filter.cc
-  - src/cpp/ext/filters/census/context.cc
-  - src/cpp/ext/filters/census/grpc_plugin.cc
-  - src/cpp/ext/filters/census/measures.cc
-  - src/cpp/ext/filters/census/rpc_encoding.cc
-  - src/cpp/ext/filters/census/server_call_tracer.cc
-  - src/cpp/ext/filters/census/views.cc
-  - src/cpp/server/async_generic_service.cc
-  - src/cpp/server/backend_metric_recorder.cc
-  - src/cpp/server/channel_argument_option.cc
-  - src/cpp/server/create_default_thread_pool.cc
-  - src/cpp/server/external_connection_acceptor_impl.cc
-  - src/cpp/server/health/default_health_check_service.cc
-  - src/cpp/server/health/health_check_service.cc
-  - src/cpp/server/health/health_check_service_server_builder_option.cc
-  - src/cpp/server/insecure_server_credentials.cc
-  - src/cpp/server/secure_server_credentials.cc
-  - src/cpp/server/server_builder.cc
-  - src/cpp/server/server_callback.cc
-  - src/cpp/server/server_cc.cc
-  - src/cpp/server/server_context.cc
-  - src/cpp/server/server_credentials.cc
-  - src/cpp/server/server_posix.cc
-  - src/cpp/thread_manager/thread_manager.cc
-  - src/cpp/util/byte_buffer_cc.cc
-  - src/cpp/util/status.cc
-  - src/cpp/util/string_ref.cc
-  - src/cpp/util/time_cc.cc
-  - test/core/server/xds_channel_stack_modifier_test.cc
-  deps:
-  - gtest
-  - absl/base:endian
-  - absl/numeric:int128
-  - protobuf
-  - grpc_test_util
-  uses_polling: false
 - name: xds_client_test
  gtest: true
  build: test
--- a/tools/buildgen/extract_metadata_from_bazel_xml.py
+++ b/tools/buildgen/extract_metadata_from_bazel_xml.py
@ -828,7 +828,8 @@ def _exclude_unwanted_cc_tests(tests: List[str]) -> List[str]:
        test
        for test in tests
        if not test.startswith("test/cpp/ext/filters/census:")
-        and not test.startswith("test/core/xds:xds_channel_stack_modifier_test")
+        and not test.startswith(
+            "test/core/server:xds_channel_stack_modifier_test")
        and not test.startswith("test/cpp/ext/gcp:")
        and not test.startswith("test/cpp/ext/filters/logging:")
        and not test.startswith("test/cpp/interop:observability_interop")
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@ -11765,30 +11765,6 @@
    ],
    "uses_polling": false
  },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "xds_channel_stack_modifier_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
  {
    "args": [],
    "benchmark": false,