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/bad_ssl | |
| parent | 804f339338695879b7529c6d7f1d46c6bfdec19d (diff) | |
| parent | d3fb421ffacfef92af692c9753a97344f9812559 (diff) | |
Merge branch 'master' into gpr_review
Diffstat (limited to 'test/core/bad_ssl')
| -rw-r--r-- | test/core/bad_ssl/bad_ssl_test.cc | 2 | ||||
| -rw-r--r-- | test/core/bad_ssl/server_common.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/core/bad_ssl/bad_ssl_test.cc b/test/core/bad_ssl/bad_ssl_test.cc index 8aec94fd99..e2ab22e014 100644 --- a/test/core/bad_ssl/bad_ssl_test.cc +++ b/test/core/bad_ssl/bad_ssl_test.cc @@ -24,13 +24,13 @@ #include <grpc/support/alloc.h> #include <grpc/support/log.h> #include <grpc/support/string_util.h> -#include <grpc/support/subprocess.h> #include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/host_port.h" #include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/util/port.h" +#include "test/core/util/subprocess.h" #include "test/core/util/test_config.h" static void* tag(intptr_t t) { return (void*)t; } diff --git a/test/core/bad_ssl/server_common.cc b/test/core/bad_ssl/server_common.cc index 08842b8350..809539aff3 100644 --- a/test/core/bad_ssl/server_common.cc +++ b/test/core/bad_ssl/server_common.cc @@ -16,11 +16,11 @@ * */ -#include <grpc/support/cmdline.h> #include <grpc/support/log.h> #include <signal.h> #include "test/core/bad_ssl/server_common.h" +#include "test/core/util/cmdline.h" #include "test/core/util/test_config.h" /* Common server implementation details for all servers in servers/. |