diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-05-16 10:18:38 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-05-16 10:18:38 -0700 |
| commit | bc60bb25b2ee2950e6aa8689271e4f4bd13f74b3 (patch) | |
| tree | 83b0635e9a15533914c069d41f7fe0fbf5f894d1 /test/cpp/end2end/generic_end2end_test.cc | |
| parent | 928681dc3d3c738eb807b457ccd72627ac344dd3 (diff) | |
| parent | 081c442462a21f326ff08f47ff1cd9a17c6746ea (diff) | |
Merge remote-tracking branch 'upstream/master' into backward-compat-dev
Diffstat (limited to 'test/cpp/end2end/generic_end2end_test.cc')
| -rw-r--r-- | test/cpp/end2end/generic_end2end_test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/cpp/end2end/generic_end2end_test.cc b/test/cpp/end2end/generic_end2end_test.cc index 2c9f5e38e6..281c58efad 100644 --- a/test/cpp/end2end/generic_end2end_test.cc +++ b/test/cpp/end2end/generic_end2end_test.cc @@ -46,13 +46,14 @@ #include <grpc/grpc.h> #include <grpc/support/thd.h> #include <grpc/support/time.h> -#include <gtest/gtest.h> #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" #include "test/cpp/util/byte_buffer_proto_helper.h" +#include <gtest/gtest.h> + using grpc::testing::EchoRequest; using grpc::testing::EchoResponse; using std::chrono::system_clock; |