diff options
author | Craig Tiller <ctiller@google.com> | 2017-03-09 10:07:00 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-09 10:07:00 -0800 |
commit | 8d7ce8cc9ddfad0d629f8419d3a0f254f353224e (patch) | |
tree | 224df514985b6bacbd82b09be863ddda1fe1899d /test/core | |
parent | 7375d53de7e65ae15b320dd7b0f70d9ce2f5aae6 (diff) | |
parent | 2d42debc5a4be49f1339c4f4300906efc60105e2 (diff) |
Merge pull request #10070 from ctiller/fmac
Redo bm_fullstack split, fixing mac build
Diffstat (limited to 'test/core')
-rw-r--r-- | test/core/end2end/BUILD | 4 | ||||
-rw-r--r-- | test/core/end2end/fixtures/h2_http_proxy.c | 2 | ||||
-rw-r--r-- | test/core/end2end/fixtures/http_proxy_fixture.c (renamed from test/core/end2end/fixtures/http_proxy.c) | 2 | ||||
-rw-r--r-- | test/core/end2end/fixtures/http_proxy_fixture.h (renamed from test/core/end2end/fixtures/http_proxy.h) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD index a40fb8e083..0cef7aa01d 100644 --- a/test/core/end2end/BUILD +++ b/test/core/end2end/BUILD @@ -63,8 +63,8 @@ cc_library( cc_library( name = 'http_proxy', - hdrs = ['fixtures/http_proxy.h'], - srcs = ['fixtures/http_proxy.c'], + hdrs = ['fixtures/http_proxy_fixture.h'], + srcs = ['fixtures/http_proxy_fixture.c'], copts = ['-std=c99'], deps = ['//:gpr', '//:grpc', '//test/core/util:grpc_test_util'] ) diff --git a/test/core/end2end/fixtures/h2_http_proxy.c b/test/core/end2end/fixtures/h2_http_proxy.c index 44b223664a..55c65fa70e 100644 --- a/test/core/end2end/fixtures/h2_http_proxy.c +++ b/test/core/end2end/fixtures/h2_http_proxy.c @@ -49,7 +49,7 @@ #include "src/core/lib/support/env.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" -#include "test/core/end2end/fixtures/http_proxy.h" +#include "test/core/end2end/fixtures/http_proxy_fixture.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/http_proxy.c b/test/core/end2end/fixtures/http_proxy_fixture.c index 9ccb1263ee..bcd1c9914b 100644 --- a/test/core/end2end/fixtures/http_proxy.c +++ b/test/core/end2end/fixtures/http_proxy_fixture.c @@ -31,7 +31,7 @@ * */ -#include "test/core/end2end/fixtures/http_proxy.h" +#include "test/core/end2end/fixtures/http_proxy_fixture.h" #include "src/core/lib/iomgr/sockaddr.h" diff --git a/test/core/end2end/fixtures/http_proxy.h b/test/core/end2end/fixtures/http_proxy_fixture.h index cd47b432af..cd47b432af 100644 --- a/test/core/end2end/fixtures/http_proxy.h +++ b/test/core/end2end/fixtures/http_proxy_fixture.h |