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/memory_usage | |
| parent | 804f339338695879b7529c6d7f1d46c6bfdec19d (diff) | |
| parent | d3fb421ffacfef92af692c9753a97344f9812559 (diff) | |
Merge branch 'master' into gpr_review
Diffstat (limited to 'test/core/memory_usage')
| -rw-r--r-- | test/core/memory_usage/client.cc | 3 | ||||
| -rw-r--r-- | test/core/memory_usage/memory_usage_test.cc | 2 | ||||
| -rw-r--r-- | test/core/memory_usage/server.cc | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/test/core/memory_usage/client.cc b/test/core/memory_usage/client.cc index 74618a016d..4f2ca9e937 100644 --- a/test/core/memory_usage/client.cc +++ b/test/core/memory_usage/client.cc @@ -24,12 +24,13 @@ #include <grpc/byte_buffer.h> #include <grpc/byte_buffer_reader.h> #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/env.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" + +#include "test/core/util/cmdline.h" #include "test/core/util/memory_counters.h" #include "test/core/util/test_config.h" diff --git a/test/core/memory_usage/memory_usage_test.cc b/test/core/memory_usage/memory_usage_test.cc index f6316bda0b..cc3528b060 100644 --- a/test/core/memory_usage/memory_usage_test.cc +++ b/test/core/memory_usage/memory_usage_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/memory_usage/server.cc b/test/core/memory_usage/server.cc index f5da3cb791..a276102e83 100644 --- a/test/core/memory_usage/server.cc +++ b/test/core/memory_usage/server.cc @@ -30,12 +30,12 @@ #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 "test/core/end2end/data/ssl_test_data.h" +#include "test/core/util/cmdline.h" #include "test/core/util/memory_counters.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" |