aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-10-10 10:16:35 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-10-10 10:16:35 -0700
commitfdc2b10dce93c806edc95eb76fdca38625c47d06 (patch)
tree4c46ed34203da7750b15d7c8837c4dd0da9234d1 /Makefile
parent46db0d29061d49d68c3a0e490e036d2a076d59f9 (diff)
parent062ba7b8baefdc76f74fffb9aa3e2134ba047ea6 (diff)
Merge github.com:grpc/grpc into direct-calls
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 7631d2b3ac..496d1cee6b 100644
--- a/Makefile
+++ b/Makefile
@@ -3063,6 +3063,7 @@ LIBGRPC_TEST_UTIL_SRC = \
test/core/end2end/data/test_root_cert.c \
test/core/security/oauth2_utils.c \
test/core/end2end/cq_verifier.c \
+ test/core/end2end/fake_resolver.c \
test/core/end2end/fixtures/http_proxy.c \
test/core/end2end/fixtures/proxy.c \
test/core/iomgr/endpoint_tests.c \
@@ -3229,6 +3230,7 @@ endif
LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
test/core/end2end/cq_verifier.c \
+ test/core/end2end/fake_resolver.c \
test/core/end2end/fixtures/http_proxy.c \
test/core/end2end/fixtures/proxy.c \
test/core/iomgr/endpoint_tests.c \