diff options
| author |  yashkt <yashkt@google.com> | 2017-12-04 09:41:12 -0800 |
|---|---|---|
| committer | yashkt <yashkt@google.com> | 2017-12-04 09:41:12 -0800 |
| commit | d9f640719057ab008b493076fadd9ab773ead10c (patch) | |
| tree | ee674026030ce124037c1a887e53ddc1cfe76659 /test/core/util/test_config.h | |
| parent | 36522e9f8008cade840b75f53164602719577bc6 (diff) | |
| parent | c1b64d9c17aed4d3a055b33fd3f210ba1aaf0f8d (diff) | |
Merge master into execctx after removal of assert in tls_gcc
Diffstat (limited to 'test/core/util/test_config.h')
| -rw-r--r-- | test/core/util/test_config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/util/test_config.h b/test/core/util/test_config.h index 775ffac949..5b3d34799e 100644 --- a/test/core/util/test_config.h +++ b/test/core/util/test_config.h @@ -33,7 +33,7 @@ gpr_timespec grpc_timeout_seconds_to_deadline(int64_t time_s); /* Converts a given timeout (in milliseconds) to a deadline. */ gpr_timespec grpc_timeout_milliseconds_to_deadline(int64_t time_ms); -#ifndef GRPC_TEST_CUSTOM_PICK_PORT +#if !defined(GRPC_TEST_CUSTOM_PICK_PORT) && !defined(GRPC_PORT_ISOLATED_RUNTIME) #define GRPC_TEST_PICK_PORT #endif |