From d56dae0767af60e3f0d8562a05fd61ba1578325c Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Tue, 8 Nov 2016 07:47:24 -0800
Subject: [PATCH] Merge
---
src/cpp/common/version_cc.cc | 2 +-
test/core/end2end/end2end_nosec_tests.c | 13 -------------
test/core/end2end/end2end_tests.c | 13 -------------
3 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc
index 826ddfba61..7be338417f 100644
--- a/src/cpp/common/version_cc.cc
+++ b/src/cpp/common/version_cc.cc
@@ -37,5 +37,5 @@
#include <grpc++/grpc++.h>
namespace grpc {
-std::string Version() { return "1.1.0-dev"; }
+grpc::string Version() { return "1.1.0-dev"; }
}
diff --git a/test/core/end2end/end2end_nosec_tests.c b/test/core/end2end/end2end_nosec_tests.c
index 7e9b6eb233..caaa97c215 100644
--- a/test/core/end2end/end2end_nosec_tests.c
+++ b/test/core/end2end/end2end_nosec_tests.c
@@ -416,16 +416,3 @@ void grpc_end2end_tests(int argc, char **argv,
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));
- }
-}
diff --git a/test/core/end2end/end2end_tests.c b/test/core/end2end/end2end_tests.c
index 0fbad22641..6d17e686e6 100644
--- a/test/core/end2end/end2end_tests.c
+++ b/test/core/end2end/end2end_tests.c
@@ -424,16 +424,3 @@ void grpc_end2end_tests(int argc, char **argv,
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));
- }
-}
--
GitLab