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/cpp | |
| parent | 804f339338695879b7529c6d7f1d46c6bfdec19d (diff) | |
| parent | d3fb421ffacfef92af692c9753a97344f9812559 (diff) | |
Merge branch 'master' into gpr_review
Diffstat (limited to 'test/cpp')
| -rw-r--r-- | test/cpp/util/BUILD | 2 | ||||
| -rw-r--r-- | test/cpp/util/subprocess.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/test/cpp/util/BUILD b/test/cpp/util/BUILD index af25fca185..d092ba348e 100644 --- a/test/cpp/util/BUILD +++ b/test/cpp/util/BUILD @@ -74,6 +74,7 @@ grpc_cc_library( deps = [ "//:grpc++", "//test/core/end2end:ssl_test_data", + "//test/core/util:grpc_test_util", ], external_deps = [ "protobuf", @@ -86,6 +87,7 @@ grpc_cc_library( hdrs = GRPCXX_TESTUTIL_HDRS, deps = [ "//:grpc++_unsecure", + "//test/core/util:grpc_test_util", ], external_deps = [ "protobuf", diff --git a/test/cpp/util/subprocess.cc b/test/cpp/util/subprocess.cc index a54d0c087a..ddaad89805 100644 --- a/test/cpp/util/subprocess.cc +++ b/test/cpp/util/subprocess.cc @@ -20,7 +20,7 @@ #include <vector> -#include <grpc/support/subprocess.h> +#include "test/core/util/subprocess.h" namespace grpc { |