aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/cpp/end2end/mock_test.cc
diff options
context:
space:
mode:
authorGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2017-05-10 18:33:12 +0200
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2017-05-10 18:33:12 +0200
commit3726e3d37b30bd99f565856672bf4c8db3ec38a3 (patch)
tree366bf4ba9894e23ed0011e4a98a4506de306dd07 /test/cpp/end2end/mock_test.cc
parent71ca4200f6ff7a73c64369d9f1f041c306124ae8 (diff)
Moving gtest include down.
In some cases, depending on the direction of the wind, and the phase of the moon, gtest can interfere with protobuf badly with macros cross-pollution between the two projects. Moving the gtest inclusion at the end makes the problem go away.
Diffstat (limited to 'test/cpp/end2end/mock_test.cc')
-rw-r--r--test/cpp/end2end/mock_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/cpp/end2end/mock_test.cc b/test/cpp/end2end/mock_test.cc
index fdb2732e50..3f5a6eedf9 100644
--- a/test/cpp/end2end/mock_test.cc
+++ b/test/cpp/end2end/mock_test.cc
@@ -44,13 +44,14 @@
#include <grpc/support/log.h>
#include <grpc/support/thd.h>
#include <grpc/support/time.h>
-#include <gtest/gtest.h>
#include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h"
#include "src/proto/grpc/testing/echo.grpc.pb.h"
#include "test/core/util/port.h"
#include "test/core/util/test_config.h"
+#include <gtest/gtest.h>
+
using grpc::testing::EchoRequest;
using grpc::testing::EchoResponse;
using grpc::testing::EchoTestService;