remove dependencies that cause failures

pull/22814/head
ZhenLian 5 years ago
parent d75de51e43
commit 6a045297c2
  1. 8
      CMakeLists.txt
  2. 12
      Makefile
  3. 10
      build_autogenerated.yaml
  4. 5
      gRPC-Core.podspec
  5. 8
      grpc.gyp
  6. 2
      test/core/end2end/generate_tests.bzl

@ -895,6 +895,10 @@ if(gRPC_BUILD_TESTS)
add_library(end2end_nosec_tests add_library(end2end_nosec_tests
test/core/end2end/cq_verifier.cc test/core/end2end/cq_verifier.cc
test/core/end2end/data/client_certs.cc
test/core/end2end/data/server1_cert.cc
test/core/end2end/data/server1_key.cc
test/core/end2end/data/test_root_cert.cc
test/core/end2end/end2end_nosec_tests.cc test/core/end2end/end2end_nosec_tests.cc
test/core/end2end/end2end_test_utils.cc test/core/end2end/end2end_test_utils.cc
test/core/end2end/fixtures/http_proxy_fixture.cc test/core/end2end/fixtures/http_proxy_fixture.cc
@ -1022,6 +1026,10 @@ if(gRPC_BUILD_TESTS)
add_library(end2end_tests add_library(end2end_tests
test/core/end2end/cq_verifier.cc test/core/end2end/cq_verifier.cc
test/core/end2end/data/client_certs.cc
test/core/end2end/data/server1_cert.cc
test/core/end2end/data/server1_key.cc
test/core/end2end/data/test_root_cert.cc
test/core/end2end/end2end_test_utils.cc test/core/end2end/end2end_test_utils.cc
test/core/end2end/end2end_tests.cc test/core/end2end/end2end_tests.cc
test/core/end2end/fixtures/http_proxy_fixture.cc test/core/end2end/fixtures/http_proxy_fixture.cc

@ -3258,6 +3258,10 @@ endif
LIBEND2END_NOSEC_TESTS_SRC = \ LIBEND2END_NOSEC_TESTS_SRC = \
test/core/end2end/cq_verifier.cc \ test/core/end2end/cq_verifier.cc \
test/core/end2end/data/client_certs.cc \
test/core/end2end/data/server1_cert.cc \
test/core/end2end/data/server1_key.cc \
test/core/end2end/data/test_root_cert.cc \
test/core/end2end/end2end_nosec_tests.cc \ test/core/end2end/end2end_nosec_tests.cc \
test/core/end2end/end2end_test_utils.cc \ test/core/end2end/end2end_test_utils.cc \
test/core/end2end/fixtures/http_proxy_fixture.cc \ test/core/end2end/fixtures/http_proxy_fixture.cc \
@ -3366,6 +3370,10 @@ endif
LIBEND2END_TESTS_SRC = \ LIBEND2END_TESTS_SRC = \
test/core/end2end/cq_verifier.cc \ test/core/end2end/cq_verifier.cc \
test/core/end2end/data/client_certs.cc \
test/core/end2end/data/server1_cert.cc \
test/core/end2end/data/server1_key.cc \
test/core/end2end/data/test_root_cert.cc \
test/core/end2end/end2end_test_utils.cc \ test/core/end2end/end2end_test_utils.cc \
test/core/end2end/end2end_tests.cc \ test/core/end2end/end2end_tests.cc \
test/core/end2end/fixtures/http_proxy_fixture.cc \ test/core/end2end/fixtures/http_proxy_fixture.cc \
@ -20023,10 +20031,6 @@ src/cpp/server/channelz/channelz_service_plugin.cc: $(OPENSSL_DEP)
src/cpp/server/secure_server_credentials.cc: $(OPENSSL_DEP) src/cpp/server/secure_server_credentials.cc: $(OPENSSL_DEP)
src/cpp/util/error_details.cc: $(OPENSSL_DEP) src/cpp/util/error_details.cc: $(OPENSSL_DEP)
src/csharp/ext/grpc_csharp_ext.c: $(OPENSSL_DEP) src/csharp/ext/grpc_csharp_ext.c: $(OPENSSL_DEP)
test/core/end2end/data/client_certs.cc: $(OPENSSL_DEP)
test/core/end2end/data/server1_cert.cc: $(OPENSSL_DEP)
test/core/end2end/data/server1_key.cc: $(OPENSSL_DEP)
test/core/end2end/data/test_root_cert.cc: $(OPENSSL_DEP)
test/core/end2end/end2end_tests.cc: $(OPENSSL_DEP) test/core/end2end/end2end_tests.cc: $(OPENSSL_DEP)
test/core/end2end/tests/call_creds.cc: $(OPENSSL_DEP) test/core/end2end/tests/call_creds.cc: $(OPENSSL_DEP)
test/cpp/microbenchmarks/helpers.cc: $(OPENSSL_DEP) test/cpp/microbenchmarks/helpers.cc: $(OPENSSL_DEP)

@ -19,6 +19,7 @@ libs:
public_headers: [] public_headers: []
headers: headers:
- test/core/end2end/cq_verifier.h - test/core/end2end/cq_verifier.h
- test/core/end2end/data/ssl_test_data.h
- test/core/end2end/end2end_tests.h - test/core/end2end/end2end_tests.h
- test/core/end2end/fixtures/http_proxy_fixture.h - test/core/end2end/fixtures/http_proxy_fixture.h
- test/core/end2end/fixtures/local_util.h - test/core/end2end/fixtures/local_util.h
@ -26,6 +27,10 @@ libs:
- test/core/end2end/tests/cancel_test_helpers.h - test/core/end2end/tests/cancel_test_helpers.h
src: src:
- test/core/end2end/cq_verifier.cc - test/core/end2end/cq_verifier.cc
- test/core/end2end/data/client_certs.cc
- test/core/end2end/data/server1_cert.cc
- test/core/end2end/data/server1_key.cc
- test/core/end2end/data/test_root_cert.cc
- test/core/end2end/end2end_nosec_tests.cc - test/core/end2end/end2end_nosec_tests.cc
- test/core/end2end/end2end_test_utils.cc - test/core/end2end/end2end_test_utils.cc
- test/core/end2end/fixtures/http_proxy_fixture.cc - test/core/end2end/fixtures/http_proxy_fixture.cc
@ -122,6 +127,7 @@ libs:
public_headers: [] public_headers: []
headers: headers:
- test/core/end2end/cq_verifier.h - test/core/end2end/cq_verifier.h
- test/core/end2end/data/ssl_test_data.h
- test/core/end2end/end2end_tests.h - test/core/end2end/end2end_tests.h
- test/core/end2end/fixtures/http_proxy_fixture.h - test/core/end2end/fixtures/http_proxy_fixture.h
- test/core/end2end/fixtures/local_util.h - test/core/end2end/fixtures/local_util.h
@ -129,6 +135,10 @@ libs:
- test/core/end2end/tests/cancel_test_helpers.h - test/core/end2end/tests/cancel_test_helpers.h
src: src:
- test/core/end2end/cq_verifier.cc - test/core/end2end/cq_verifier.cc
- test/core/end2end/data/client_certs.cc
- test/core/end2end/data/server1_cert.cc
- test/core/end2end/data/server1_key.cc
- test/core/end2end/data/test_root_cert.cc
- test/core/end2end/end2end_test_utils.cc - test/core/end2end/end2end_test_utils.cc
- test/core/end2end/end2end_tests.cc - test/core/end2end/end2end_tests.cc
- test/core/end2end/fixtures/http_proxy_fixture.cc - test/core/end2end/fixtures/http_proxy_fixture.cc

@ -1452,6 +1452,11 @@ Pod::Spec.new do |s|
ss.source_files = 'test/core/end2end/cq_verifier.cc', ss.source_files = 'test/core/end2end/cq_verifier.cc',
'test/core/end2end/cq_verifier.h', 'test/core/end2end/cq_verifier.h',
'test/core/end2end/data/client_certs.cc',
'test/core/end2end/data/server1_cert.cc',
'test/core/end2end/data/server1_key.cc',
'test/core/end2end/data/ssl_test_data.h',
'test/core/end2end/data/test_root_cert.cc',
'test/core/end2end/end2end_test_utils.cc', 'test/core/end2end/end2end_test_utils.cc',
'test/core/end2end/end2end_tests.cc', 'test/core/end2end/end2end_tests.cc',
'test/core/end2end/end2end_tests.h', 'test/core/end2end/end2end_tests.h',

@ -176,6 +176,10 @@
], ],
'sources': [ 'sources': [
'test/core/end2end/cq_verifier.cc', 'test/core/end2end/cq_verifier.cc',
'test/core/end2end/data/client_certs.cc',
'test/core/end2end/data/server1_cert.cc',
'test/core/end2end/data/server1_key.cc',
'test/core/end2end/data/test_root_cert.cc',
'test/core/end2end/end2end_nosec_tests.cc', 'test/core/end2end/end2end_nosec_tests.cc',
'test/core/end2end/end2end_test_utils.cc', 'test/core/end2end/end2end_test_utils.cc',
'test/core/end2end/fixtures/http_proxy_fixture.cc', 'test/core/end2end/fixtures/http_proxy_fixture.cc',
@ -273,6 +277,10 @@
], ],
'sources': [ 'sources': [
'test/core/end2end/cq_verifier.cc', 'test/core/end2end/cq_verifier.cc',
'test/core/end2end/data/client_certs.cc',
'test/core/end2end/data/server1_cert.cc',
'test/core/end2end/data/server1_key.cc',
'test/core/end2end/data/test_root_cert.cc',
'test/core/end2end/end2end_test_utils.cc', 'test/core/end2end/end2end_test_utils.cc',
'test/core/end2end/end2end_tests.cc', 'test/core/end2end/end2end_tests.cc',
'test/core/end2end/fixtures/http_proxy_fixture.cc', 'test/core/end2end/fixtures/http_proxy_fixture.cc',

@ -422,6 +422,7 @@ def grpc_end2end_tests():
language = "C++", language = "C++",
deps = [ deps = [
":cq_verifier", ":cq_verifier",
":ssl_test_data",
":http_proxy", ":http_proxy",
":proxy", ":proxy",
":local_util", ":local_util",
@ -496,6 +497,7 @@ def grpc_end2end_nosec_tests():
language = "C++", language = "C++",
deps = [ deps = [
":cq_verifier", ":cq_verifier",
":ssl_test_data",
":http_proxy", ":http_proxy",
":proxy", ":proxy",
":local_util", ":local_util",

Loading…
Cancel
Save