diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-08 12:18:09 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-02-08 12:18:09 -0800 |
| commit | 18b9133f31e394ea81c6ae5a44efe802904b3140 (patch) | |
| tree | 14cd93ac3ee2964f3b185a5c02b456283e2fd515 /test/core/fling | |
| parent | 804f339338695879b7529c6d7f1d46c6bfdec19d (diff) | |
| parent | d3fb421ffacfef92af692c9753a97344f9812559 (diff) | |
Merge branch 'master' into gpr_review
Diffstat (limited to 'test/core/fling')
| -rw-r--r-- | test/core/fling/client.cc | 2 | ||||
| -rw-r--r-- | test/core/fling/fling_stream_test.cc | 2 | ||||
| -rw-r--r-- | test/core/fling/fling_test.cc | 2 | ||||
| -rw-r--r-- | test/core/fling/server.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/core/fling/client.cc b/test/core/fling/client.cc index 2d3d1b1a94..92f59b7fdb 100644 --- a/test/core/fling/client.cc +++ b/test/core/fling/client.cc @@ -21,12 +21,12 @@ #include <stdio.h> #include <string.h> -#include <grpc/support/cmdline.h> #include <grpc/support/log.h> #include <grpc/support/time.h> #include "src/core/lib/gpr/useful.h" #include "src/core/lib/profiling/timers.h" +#include "test/core/util/cmdline.h" #include "test/core/util/grpc_profiler.h" #include "test/core/util/histogram.h" #include "test/core/util/test_config.h" diff --git a/test/core/fling/fling_stream_test.cc b/test/core/fling/fling_stream_test.cc index 6b29486f22..d5fd7a8d46 100644 --- a/test/core/fling/fling_stream_test.cc +++ b/test/core/fling/fling_stream_test.cc @@ -21,11 +21,11 @@ #include <grpc/support/alloc.h> #include <grpc/support/string_util.h> -#include <grpc/support/subprocess.h> #include "src/core/lib/gpr/host_port.h" #include "src/core/lib/gpr/string.h" #include "test/core/util/port.h" +#include "test/core/util/subprocess.h" int main(int argc, char** argv) { char* me = argv[0]; diff --git a/test/core/fling/fling_test.cc b/test/core/fling/fling_test.cc index ceb9851bc9..d95317b7e6 100644 --- a/test/core/fling/fling_test.cc +++ b/test/core/fling/fling_test.cc @@ -21,11 +21,11 @@ #include <grpc/support/alloc.h> #include <grpc/support/string_util.h> -#include <grpc/support/subprocess.h> #include "src/core/lib/gpr/host_port.h" #include "src/core/lib/gpr/string.h" #include "test/core/util/port.h" +#include "test/core/util/subprocess.h" int main(int argc, const char** argv) { const char* me = argv[0]; diff --git a/test/core/fling/server.cc b/test/core/fling/server.cc index 328bd4edbd..b19a25a185 100644 --- a/test/core/fling/server.cc +++ b/test/core/fling/server.cc @@ -30,13 +30,13 @@ #endif #include <grpc/support/alloc.h> -#include <grpc/support/cmdline.h> #include <grpc/support/log.h> #include <grpc/support/time.h> #include "src/core/lib/gpr/host_port.h" #include "src/core/lib/profiling/timers.h" #include "test/core/end2end/data/ssl_test_data.h" +#include "test/core/util/cmdline.h" #include "test/core/util/grpc_profiler.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" |