From d66bb39b121323502beebc79954f4b00e09bdfa1 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Fri, 17 Jan 2020 12:26:46 -0800 Subject: [PATCH 1/2] Reduce testing load on MacOS systems --- test/core/surface/concurrent_connectivity_test.cc | 6 ++++++ test/core/surface/sequential_connectivity_test.cc | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index b020d094231..0d2bf7f7f66 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -40,7 +40,13 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" +/* TODO(yashykt): When our macos testing infrastructure becomes good enough, we wouldn't need to reduce the number of threads on MacOS */ +#ifdef __APPLE__ +#define NUM_THREADS 10 +#else #define NUM_THREADS 100 +#endif /* __APPLE */ + #define NUM_OUTER_LOOPS 10 #define NUM_INNER_LOOPS 10 #define DELAY_MILLIS 10 diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index 46c4a24f5ed..4ad6f2d3372 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -35,7 +35,12 @@ typedef struct test_fixture { grpc_channel* (*create_channel)(const char* addr); } test_fixture; +/* TODO(yashykt): When our macos testing infrastructure becomes good enough, we wouldn't need to reduce the number of connections on MacOS */ +#ifdef __APPLE__ +#define NUM_CONNECTIONS 100 +#else #define NUM_CONNECTIONS 1000 +#endif /* __APPLE__ */ typedef struct { grpc_server* server; From f6ae5426f61d3bdbf94065acd84f1aadf6d1beca Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Fri, 17 Jan 2020 13:03:25 -0800 Subject: [PATCH 2/2] Clang format --- test/core/surface/concurrent_connectivity_test.cc | 3 ++- test/core/surface/sequential_connectivity_test.cc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index 0d2bf7f7f66..591c52c6f8f 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -40,7 +40,8 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -/* TODO(yashykt): When our macos testing infrastructure becomes good enough, we wouldn't need to reduce the number of threads on MacOS */ +/* TODO(yashykt): When our macos testing infrastructure becomes good enough, we + * wouldn't need to reduce the number of threads on MacOS */ #ifdef __APPLE__ #define NUM_THREADS 10 #else diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index 4ad6f2d3372..c4a8667331c 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -35,7 +35,8 @@ typedef struct test_fixture { grpc_channel* (*create_channel)(const char* addr); } test_fixture; -/* TODO(yashykt): When our macos testing infrastructure becomes good enough, we wouldn't need to reduce the number of connections on MacOS */ +/* TODO(yashykt): When our macos testing infrastructure becomes good enough, we + * wouldn't need to reduce the number of connections on MacOS */ #ifdef __APPLE__ #define NUM_CONNECTIONS 100 #else