diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-10-05 17:12:45 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-10-05 17:12:45 -0700 |
| commit | dc75e30e874aab0985d16994c56d3460ed10a65f (patch) | |
| tree | f11ac7c92b14e618c1895ddcfba0928b7208d44a /Makefile | |
| parent | 9d215ef934b4fc902aa178cf150d7804803a3768 (diff) | |
| parent | c43aa51fb0a106688a46bb15c951ee0b0b768f30 (diff) | |
Merge remote-tracking branch 'upstream/master' into cares_buildin
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -3114,6 +3114,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 \ @@ -3281,6 +3282,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 \ |