diff options
| author |  Noah Eisen <ncteisen@google.com> | 2017-04-25 17:01:08 -0700 |
|---|---|---|
| committer | Noah Eisen <ncteisen@google.com> | 2017-04-25 17:01:08 -0700 |
| commit | f725d7e6b6ac57641e67f363f3e3b585d074f0e2 (patch) | |
| tree | 08d98309e9fe0993e6fb33e79662776fc7cc5b54 /test/core/util | |
| parent | ad8d36d4dcd4deeec2d05644b78eb78ae0918f06 (diff) | |
| parent | b864e7c41c6d0363e23093fb090625f260994962 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into client-auth-filter-fuzz
Diffstat (limited to 'test/core/util')
| -rw-r--r-- | test/core/util/port_server_client.c | 4 | ||||
| -rw-r--r-- | test/core/util/test_config.c | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/test/core/util/port_server_client.c b/test/core/util/port_server_client.c index 38054dd1e7..254c3a6b61 100644 --- a/test/core/util/port_server_client.c +++ b/test/core/util/port_server_client.c @@ -103,7 +103,7 @@ void grpc_free_port_using_server(int port) { grpc_resource_quota *resource_quota = grpc_resource_quota_create("port_server_client/free"); grpc_httpcli_get(&exec_ctx, &context, &pr.pops, resource_quota, &req, - grpc_timeout_seconds_to_deadline(10), + grpc_timeout_seconds_to_deadline(30), grpc_closure_create(freed_port_from_server, &pr, grpc_schedule_on_exec_ctx), &rsp); @@ -235,7 +235,7 @@ int grpc_pick_port_using_server(void) { grpc_resource_quota_create("port_server_client/pick"); grpc_httpcli_get( &exec_ctx, &context, &pr.pops, resource_quota, &req, - grpc_timeout_seconds_to_deadline(10), + grpc_timeout_seconds_to_deadline(30), grpc_closure_create(got_port_from_server, &pr, grpc_schedule_on_exec_ctx), &pr.response); grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); diff --git a/test/core/util/test_config.c b/test/core/util/test_config.c index 0180d6f08d..9a400c54ca 100644 --- a/test/core/util/test_config.c +++ b/test/core/util/test_config.c @@ -348,6 +348,14 @@ bool BuiltUnderMsan() { #endif } +bool BuiltUnderUbsan() { +#ifdef GRPC_UBSAN + return true; +#else + return false; +#endif +} + int64_t grpc_test_sanitizer_slowdown_factor() { int64_t sanitizer_multiplier = 1; if (BuiltUnderValgrind()) { @@ -358,6 +366,8 @@ int64_t grpc_test_sanitizer_slowdown_factor() { sanitizer_multiplier = 3; } else if (BuiltUnderMsan()) { sanitizer_multiplier = 4; + } else if (BuiltUnderUbsan()) { + sanitizer_multiplier = 5; } return sanitizer_multiplier; } |