diff options
author | 2017-02-06 13:40:43 -0800 | |
---|---|---|
committer | 2017-02-06 13:40:43 -0800 | |
commit | 7a008c9311c037524b3401c81983e8788d71d679 (patch) | |
tree | 3a619e8be6d0d425a621bcda4f8758e276579f69 /test/core/end2end/end2end_test_utils.c | |
parent | 1783bd3c99c51b75402fac2195926c1ffd3b6c72 (diff) | |
parent | d6d2677637fee5d2988dae08cee1b909d822c650 (diff) |
Merge remote-tracking branch 'upstream/master' into automate-objc-version-advancement
Diffstat (limited to 'test/core/end2end/end2end_test_utils.c')
-rw-r--r-- | test/core/end2end/end2end_test_utils.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/test/core/end2end/end2end_test_utils.c b/test/core/end2end/end2end_test_utils.c index 46fb4ec1af..8783d8451b 100644 --- a/test/core/end2end/end2end_test_utils.c +++ b/test/core/end2end/end2end_test_utils.c @@ -39,13 +39,27 @@ const char *get_host_override_string(const char *str, grpc_end2end_test_config config) { - return (config.feature_mask & FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER ? str - : NULL); + if (config.feature_mask & FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER) { + return str; + } else { + return NULL; + } +} + +const grpc_slice *get_host_override_slice(const char *str, + grpc_end2end_test_config config) { + const char *r = get_host_override_string(str, config); + if (r != NULL) { + static grpc_slice ret; + ret = grpc_slice_from_static_string(r); + return &ret; + } + return NULL; } -void validate_host_override_string(const char *pattern, const char *str, +void validate_host_override_string(const char *pattern, grpc_slice str, grpc_end2end_test_config config) { if (config.feature_mask & FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER) { - GPR_ASSERT(0 == strcmp(str, pattern)); + GPR_ASSERT(0 == grpc_slice_str_cmp(str, pattern)); } } |