diff options
author | 2016-09-08 01:58:49 +0200 | |
---|---|---|
committer | 2016-09-08 01:58:49 +0200 | |
commit | 5928bff0c7765766af2ea1ce8120317810eb4f8c (patch) | |
tree | b6d74bcac7fb0c3e83d466a6b07660237b0c3d63 /test/core/bad_ssl | |
parent | 483f90b5da6765a05e7807a1a9a7e2f2d0484b28 (diff) | |
parent | 7a209ace0e6c3b67fcefdfd3a2e50620312ee3a2 (diff) |
Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge
Diffstat (limited to 'test/core/bad_ssl')
-rwxr-xr-x | test/core/bad_ssl/gen_build_yaml.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/core/bad_ssl/gen_build_yaml.py b/test/core/bad_ssl/gen_build_yaml.py index 69f921989c..c17b17eb13 100755 --- a/test/core/bad_ssl/gen_build_yaml.py +++ b/test/core/bad_ssl/gen_build_yaml.py @@ -41,7 +41,8 @@ default_test_options = TestOptions(False, 1.0) # maps test names to options BAD_CLIENT_TESTS = { 'cert': default_test_options._replace(cpu_cost=0.1), - 'alpn': default_test_options._replace(cpu_cost=0.1), + # Disabling this test because it does not link correctly as written + # 'alpn': default_test_options._replace(cpu_cost=0.1), } def main(): |