Skip to content
Snippets Groups Projects
Commit d56dae07 authored by Craig Tiller's avatar Craig Tiller
Browse files

Merge

parent 31606bdb
No related branches found
No related tags found
No related merge requests found
...@@ -37,5 +37,5 @@ ...@@ -37,5 +37,5 @@
#include <grpc++/grpc++.h> #include <grpc++/grpc++.h>
namespace grpc { namespace grpc {
std::string Version() { return "1.1.0-dev"; } grpc::string Version() { return "1.1.0-dev"; }
} }
...@@ -416,16 +416,3 @@ void grpc_end2end_tests(int argc, char **argv, ...@@ -416,16 +416,3 @@ void grpc_end2end_tests(int argc, char **argv,
abort(); abort();
} }
} }
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);
}
void validate_host_override_string(const char *pattern, const char *str,
grpc_end2end_test_config config) {
if (config.feature_mask & FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER) {
GPR_ASSERT(0 == strcmp(str, pattern));
}
}
...@@ -424,16 +424,3 @@ void grpc_end2end_tests(int argc, char **argv, ...@@ -424,16 +424,3 @@ void grpc_end2end_tests(int argc, char **argv,
abort(); abort();
} }
} }
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);
}
void validate_host_override_string(const char *pattern, const char *str,
grpc_end2end_test_config config) {
if (config.feature_mask & FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER) {
GPR_ASSERT(0 == strcmp(str, pattern));
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment