diff options
author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-05-10 18:33:12 +0200 |
---|---|---|
committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-05-10 18:33:12 +0200 |
commit | 3726e3d37b30bd99f565856672bf4c8db3ec38a3 (patch) | |
tree | 366bf4ba9894e23ed0011e4a98a4506de306dd07 /test/cpp/end2end/thread_stress_test.cc | |
parent | 71ca4200f6ff7a73c64369d9f1f041c306124ae8 (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/thread_stress_test.cc')
-rw-r--r-- | test/cpp/end2end/thread_stress_test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/cpp/end2end/thread_stress_test.cc b/test/cpp/end2end/thread_stress_test.cc index d353f9894b..defa7894ff 100644 --- a/test/cpp/end2end/thread_stress_test.cc +++ b/test/cpp/end2end/thread_stress_test.cc @@ -43,7 +43,6 @@ #include <grpc/grpc.h> #include <grpc/support/thd.h> #include <grpc/support/time.h> -#include <gtest/gtest.h> #include "src/core/lib/surface/api_trace.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" @@ -51,6 +50,8 @@ #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 std::chrono::system_clock; |