diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-01-22 11:58:09 -0800 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-01-22 11:58:09 -0800 |
| commit | d88f903bd1068ffc1deff59a23fd4c7714580f26 (patch) | |
| tree | 251ff8986a26ac3431c20246f0c7907e3844a1c5 /test/cpp/qps | |
| parent | a1ad7d8cb7ef2368c38e86ef785d3495c43370fa (diff) | |
| parent | a9fc084ec1be4ab8f2071227d9affb77f713e0db (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into more-clang-tidy
Diffstat (limited to 'test/cpp/qps')
| -rw-r--r-- | test/cpp/qps/driver.cc | 2 | ||||
| -rw-r--r-- | test/cpp/qps/json_run_localhost.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc index 4e960907a2..a809a27e3c 100644 --- a/test/cpp/qps/driver.cc +++ b/test/cpp/qps/driver.cc @@ -31,8 +31,8 @@ #include <grpc/support/log.h> #include <grpc/support/string_util.h> +#include "src/core/lib/gpr/env.h" #include "src/core/lib/profiling/timers.h" -#include "src/core/lib/support/env.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" #include "test/cpp/qps/client.h" diff --git a/test/cpp/qps/json_run_localhost.cc b/test/cpp/qps/json_run_localhost.cc index db8b2a3943..948c3088e6 100644 --- a/test/cpp/qps/json_run_localhost.cc +++ b/test/cpp/qps/json_run_localhost.cc @@ -26,7 +26,7 @@ #include <grpc/support/log.h> -#include "src/core/lib/support/env.h" +#include "src/core/lib/gpr/env.h" #include "test/core/util/port.h" #include "test/cpp/util/subprocess.h" |