diff options
| author |  yang-g <yangg@google.com> | 2018-12-17 11:54:03 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2018-12-17 11:54:10 -0800 |
| commit | a303a28895c28a485665fbd617af0025eac7f452 (patch) | |
| tree | fd77c6095f6fcf22856a857cf729b04cbd372e1e /test/core/end2end/generate_tests.bzl | |
| parent | aa2e731508de93c2756aac782f166598569ddc44 (diff) | |
| parent | 3f7e26e08588bcaceab674f1376d39d66cbaf71f (diff) | |
Merge with head and resolve conflict.
Diffstat (limited to 'test/core/end2end/generate_tests.bzl')
| -rwxr-xr-x | test/core/end2end/generate_tests.bzl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/core/end2end/generate_tests.bzl b/test/core/end2end/generate_tests.bzl index dd9abedebd..853619fcda 100755 --- a/test/core/end2end/generate_tests.bzl +++ b/test/core/end2end/generate_tests.bzl @@ -85,7 +85,9 @@ END2END_FIXTURES = { client_channel = False, ), "h2_ssl": _fixture_options(secure = True), - "h2_local": _fixture_options(secure = True, dns_resolver = False, _platforms = ["linux", "mac", "posix"]), + "h2_local_uds": _fixture_options(secure = True, dns_resolver = False, _platforms = ["linux", "mac", "posix"]), + "h2_local_ipv4": _fixture_options(secure = True, dns_resolver = False, _platforms = ["linux", "mac", "posix"]), + "h2_local_ipv6": _fixture_options(secure = True, dns_resolver = False, _platforms = ["linux", "mac", "posix"]), "h2_ssl_proxy": _fixture_options(includes_proxy = True, secure = True), "h2_uds": _fixture_options( dns_resolver = False, @@ -376,6 +378,7 @@ def grpc_end2end_tests(): ":ssl_test_data", ":http_proxy", ":proxy", + ":local_util", ], ) @@ -425,6 +428,7 @@ def grpc_end2end_nosec_tests(): ":ssl_test_data", ":http_proxy", ":proxy", + ":local_util", ], ) |