diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-04 11:05:42 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-04 11:05:42 -0800 |
| commit | 2d9476898b119ead1045eb31894bcd10176344fd (patch) | |
| tree | f471b62ef9ad25f06cb83b8f49b522c96a30ec27 /test | |
| parent | 647def23765596dfac0bbcc3191960c8da68f12f (diff) | |
Revert "Ensure that no #includes are inside of a namespace."
Diffstat (limited to 'test')
| -rw-r--r-- | test/cpp/interop/reconnect_interop_client.cc | 10 | ||||
| -rw-r--r-- | test/cpp/interop/reconnect_interop_server.cc | 12 | ||||
| -rw-r--r-- | test/cpp/qps/limit_cores.cc | 7 |
3 files changed, 13 insertions, 16 deletions
diff --git a/test/cpp/interop/reconnect_interop_client.cc b/test/cpp/interop/reconnect_interop_client.cc index c668edaceb..79a60cc860 100644 --- a/test/cpp/interop/reconnect_interop_client.cc +++ b/test/cpp/interop/reconnect_interop_client.cc @@ -34,16 +34,16 @@ #include <memory> #include <sstream> +#include <grpc/grpc.h> +#include <grpc/support/log.h> #include <gflags/gflags.h> #include <grpc++/channel.h> #include <grpc++/client_context.h> -#include <grpc/grpc.h> -#include <grpc/support/log.h> -#include "src/proto/grpc/testing/empty.grpc.pb.h" -#include "src/proto/grpc/testing/messages.grpc.pb.h" -#include "src/proto/grpc/testing/test.grpc.pb.h" #include "test/cpp/util/create_test_channel.h" #include "test/cpp/util/test_config.h" +#include "src/proto/grpc/testing/test.grpc.pb.h" +#include "src/proto/grpc/testing/empty.grpc.pb.h" +#include "src/proto/grpc/testing/messages.grpc.pb.h" DEFINE_int32(server_control_port, 0, "Server port for control rpcs."); DEFINE_int32(server_retry_port, 0, "Server port for testing reconnection."); diff --git a/test/cpp/interop/reconnect_interop_server.cc b/test/cpp/interop/reconnect_interop_server.cc index 1f9147d0ef..3602b8c2b0 100644 --- a/test/cpp/interop/reconnect_interop_server.cc +++ b/test/cpp/interop/reconnect_interop_server.cc @@ -31,8 +31,6 @@ * */ -// Test description at doc/connection-backoff-interop-test-description.md - #include <signal.h> #include <unistd.h> @@ -42,17 +40,17 @@ #include <sstream> #include <gflags/gflags.h> +#include <grpc/grpc.h> +#include <grpc/support/log.h> #include <grpc++/server.h> #include <grpc++/server_builder.h> #include <grpc++/server_context.h> -#include <grpc/grpc.h> -#include <grpc/support/log.h> -#include "src/proto/grpc/testing/empty.grpc.pb.h" -#include "src/proto/grpc/testing/messages.grpc.pb.h" -#include "src/proto/grpc/testing/test.grpc.pb.h" #include "test/core/util/reconnect_server.h" #include "test/cpp/util/test_config.h" +#include "src/proto/grpc/testing/test.grpc.pb.h" +#include "src/proto/grpc/testing/empty.grpc.pb.h" +#include "src/proto/grpc/testing/messages.grpc.pb.h" DEFINE_int32(control_port, 0, "Server port for controlling the server."); DEFINE_int32(retry_port, 0, diff --git a/test/cpp/qps/limit_cores.cc b/test/cpp/qps/limit_cores.cc index 1fb2d628f6..fad9a323af 100644 --- a/test/cpp/qps/limit_cores.cc +++ b/test/cpp/qps/limit_cores.cc @@ -37,15 +37,14 @@ #include <grpc/support/log.h> #include <grpc/support/port_platform.h> +namespace grpc { +namespace testing { + #ifdef GPR_CPU_LINUX #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif #include <sched.h> - -namespace grpc { -namespace testing { - int LimitCores(const int* cores, int cores_size) { const int num_cores = gpr_cpu_num_cores(); int cores_set = 0; |