aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/core
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-01-04 15:38:44 -0800
committerGravatar Craig Tiller <ctiller@google.com>2017-01-04 15:38:44 -0800
commit293ef1572bde871a0d28462bfd15eb7c13f99499 (patch)
tree18ae53a1c4478596417e678d1d132fad2ce995ea /test/core
parent3ca6019d3990125ad9c8e9f6ae2ab5b1c4749e41 (diff)
parent6f3ce09f9cf756d1d6c08a6cdf1c3110247a407f (diff)
Merge github.com:grpc/grpc into slice_with_exec_ctx
Diffstat (limited to 'test/core')
-rw-r--r--test/core/end2end/fuzzers/BUILD3
-rwxr-xr-xtest/core/end2end/generate_tests.bzl6
2 files changed, 5 insertions, 4 deletions
diff --git a/test/core/end2end/fuzzers/BUILD b/test/core/end2end/fuzzers/BUILD
index d08603148e..2adda560b4 100644
--- a/test/core/end2end/fuzzers/BUILD
+++ b/test/core/end2end/fuzzers/BUILD
@@ -32,7 +32,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer")
grpc_fuzzer(
name = "api_fuzzer",
srcs = ["api_fuzzer.c"],
- deps = ["//:gpr", "//:grpc", "//test/core/util:grpc_test_util"],
+ deps = ["//:gpr", "//:grpc", "//test/core/util:grpc_test_util", "//test/core/end2end:ssl_test_data"],
corpus = "api_fuzzer_corpus",
copts = ["-std=c99"],
)
@@ -52,4 +52,3 @@ grpc_fuzzer(
corpus = "server_fuzzer_corpus",
copts = ["-std=c99"],
)
-
diff --git a/test/core/end2end/generate_tests.bzl b/test/core/end2end/generate_tests.bzl
index aae8b4f7bd..31f330c6b9 100755
--- a/test/core/end2end/generate_tests.bzl
+++ b/test/core/end2end/generate_tests.bzl
@@ -51,7 +51,6 @@ END2END_FIXTURES = {
'h2_census': fixture_options(),
'h2_load_reporting': fixture_options(),
'h2_fakesec': fixture_options(),
- 'h2_fake_resolver': fixture_options(),
'h2_fd': fixture_options(dns_resolver=False, fullstack=False,
platforms=['linux', 'mac', 'posix']),
'h2_full': fixture_options(),
@@ -87,6 +86,7 @@ def test_options(needs_fullstack=False, needs_dns=False, proxyable=True,
END2END_TESTS = {
'bad_hostname': test_options(),
'binary_metadata': test_options(),
+ 'resource_quota_server': test_options(proxyable=False),
'call_creds': test_options(secure=True),
'cancel_after_accept': test_options(),
'cancel_after_client_done': test_options(),
@@ -129,6 +129,8 @@ END2END_TESTS = {
'simple_request': test_options(),
'streaming_error_response': test_options(),
'trailing_metadata': test_options(),
+ 'authority_not_supported': test_options(),
+ 'filter_latency': test_options(),
}
@@ -151,7 +153,7 @@ def compatible(fopt, topt):
def grpc_end2end_tests():
native.cc_library(
name = 'end2end_tests',
- srcs = ['end2end_tests.c'] + [
+ srcs = ['end2end_tests.c', 'end2end_test_utils.c'] + [
'tests/%s.c' % t
for t in sorted(END2END_TESTS.keys())],
hdrs = [