Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

WIP: Make core and C++ tests work with bazel on Mac OS

Browse Source
pull/20510/head
Prashant Jaikumar 5 years ago committed by Jan Tattermusch
parent f427cac49b
commit 2526dfade5
15 changed files with 41 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/core/lib/iomgr/endpoint_pair_posix.cc
  2. 2
      src/core/lib/iomgr/port.h
  3. 2
      src/core/lib/iomgr/udp_server.cc
  4. 6
      test/core/bad_connection/close_fd_test.cc
  5. 6
      test/core/end2end/dualstack_socket_test.cc
  6. 6
      test/core/handshake/client_ssl.cc
  7. 6
      test/core/handshake/verify_peer_options.cc
  8. 6
      test/core/iomgr/fd_posix_test.cc
  9. 6
      test/core/iomgr/socket_utils_test.cc
  10. 6
      test/core/iomgr/tcp_client_posix_test.cc
  11. 6
      test/core/iomgr/tcp_server_posix_test.cc
  12. 6
      test/core/iomgr/udp_server_test.cc
  13. 4
      test/cpp/common/timer_test.cc
  14. 8
      test/cpp/end2end/async_end2end_test.cc
  15. 8
      test/cpp/end2end/end2end_test.cc

2
src/core/lib/iomgr/endpoint_pair_posix.cc
Unescape View File

@ -20,7 +20,7 @@
#include "src/core/lib/iomgr/port.h"
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_TCP
#include "src/core/lib/iomgr/endpoint_pair.h"
#include "src/core/lib/iomgr/socket_utils_posix.h"

2
src/core/lib/iomgr/port.h
Unescape View File

@ -141,6 +141,7 @@
#define GRPC_POSIX_SOCKET_TCP_CLIENT 1
#define GRPC_POSIX_SOCKET_TCP_SERVER 1
#define GRPC_POSIX_SOCKET_TCP_SERVER_UTILS_COMMON 1
#define GRPC_POSIX_SOCKET_UDP_SERVER 1
#define GRPC_POSIX_SOCKET_UTILS_COMMON 1
#else
#define GRPC_POSIX_SOCKET 1
@ -227,6 +228,7 @@
#define GRPC_POSIX_SOCKET_TCP_CLIENT 1
#define GRPC_POSIX_SOCKET_TCP_SERVER 1
#define GRPC_POSIX_SOCKET_TCP_SERVER_UTILS_COMMON 1
#define GRPC_POSIX_SOCKET_UDP_SERVER 1
#define GRPC_POSIX_SOCKET_UTILS_COMMON 1
#endif

2
src/core/lib/iomgr/udp_server.cc
Unescape View File

@ -29,7 +29,7 @@
#include "src/core/lib/iomgr/port.h"
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_UDP_SERVER
#include "src/core/lib/iomgr/udp_server.h"

6
test/core/bad_connection/close_fd_test.cc
Unescape View File

@ -24,7 +24,7 @@
#include "src/core/lib/iomgr/port.h"
// This test won't work except with posix sockets enabled
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_TCP
#include "test/core/util/test_config.h"
@ -751,8 +751,8 @@ int main(int argc, char** argv) {
return 0;
}
#else /* GRPC_POSIX_SOCKET */
#else /* GRPC_POSIX_SOCKET_TCP */
int main(int argc, char** argv) { return 1; }
#endif /* GRPC_POSIX_SOCKET */
#endif /* GRPC_POSIX_SOCKET_TCP */

6
test/core/end2end/dualstack_socket_test.cc
Unescape View File

@ -19,7 +19,7 @@
#include "src/core/lib/iomgr/port.h"
// This test won't work except with posix sockets enabled
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_EV
#include <string.h>
@ -370,8 +370,8 @@ int main(int argc, char** argv) {
return 0;
}
#else /* GRPC_POSIX_SOCKET */
#else /* GRPC_POSIX_SOCKET_EV */
int main(int argc, char** argv) { return 1; }
#endif /* GRPC_POSIX_SOCKET */
#endif /* GRPC_POSIX_SOCKET_EV */

6
test/core/handshake/client_ssl.cc
Unescape View File

@ -19,7 +19,7 @@
#include "src/core/lib/iomgr/port.h"
// This test won't work except with posix sockets enabled
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_TCP
#include <arpa/inet.h>
#include <openssl/err.h>
@ -322,8 +322,8 @@ int main(int /*argc*/, char* /*argv*/ []) {
return 0;
}
#else /* GRPC_POSIX_SOCKET */
#else /* GRPC_POSIX_SOCKET_TCP */
int main(int argc, char** argv) { return 1; }
#endif /* GRPC_POSIX_SOCKET */
#endif /* GRPC_POSIX_SOCKET_TCP */

6
test/core/handshake/verify_peer_options.cc
Unescape View File

@ -19,7 +19,7 @@
#include "src/core/lib/iomgr/port.h"
// This test won't work except with posix sockets enabled
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_TCP
#include <arpa/inet.h>
#include <openssl/err.h>
@ -268,8 +268,8 @@ int main(int /*argc*/, char* /*argv*/ []) {
return 0;
}
#else /* GRPC_POSIX_SOCKET */
#else /* GRPC_POSIX_SOCKET_TCP */
int main(int argc, char** argv) { return 1; }
#endif /* GRPC_POSIX_SOCKET */
#endif /* GRPC_POSIX_SOCKET_TCP */

6
test/core/iomgr/fd_posix_test.cc
Unescape View File

@ -19,7 +19,7 @@
#include "src/core/lib/iomgr/port.h"
// This test won't work except with posix sockets enabled
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_EV
#include "src/core/lib/iomgr/ev_posix.h"
@ -533,8 +533,8 @@ int main(int argc, char** argv) {
return 0;
}
#else /* GRPC_POSIX_SOCKET */
#else /* GRPC_POSIX_SOCKET_EV */
int main(int argc, char** argv) { return 1; }
#endif /* GRPC_POSIX_SOCKET */
#endif /* GRPC_POSIX_SOCKET_EV */

6
test/core/iomgr/socket_utils_test.cc
Unescape View File

@ -19,7 +19,7 @@
#include "src/core/lib/iomgr/port.h"
// This test won't work except with posix sockets enabled
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_UTILS_COMMON
#include "src/core/lib/iomgr/socket_utils_posix.h"
@ -132,8 +132,8 @@ int main(int argc, char** argv) {
return 0;
}
#else /* GRPC_POSIX_SOCKET */
#else /* GRPC_POSIX_SOCKET_UTILS_COMMON */
int main(int argc, char** argv) { return 1; }
#endif /* GRPC_POSIX_SOCKET */
#endif /* GRPC_POSIX_SOCKET_UTILS_COMMON */

6
test/core/iomgr/tcp_client_posix_test.cc
Unescape View File

@ -19,7 +19,7 @@
#include "src/core/lib/iomgr/port.h"
// This test won't work except with posix sockets enabled
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_TCP_CLIENT
#include "src/core/lib/iomgr/tcp_client.h"
@ -215,8 +215,8 @@ int main(int argc, char** argv) {
return 0;
}
#else /* GRPC_POSIX_SOCKET */
#else /* GRPC_POSIX_SOCKET_TCP_CLIENT */
int main(int argc, char** argv) { return 1; }
#endif /* GRPC_POSIX_SOCKET */
#endif /* GRPC_POSIX_SOCKET_CLIENT */

6
test/core/iomgr/tcp_server_posix_test.cc
Unescape View File

@ -19,7 +19,7 @@
#include "src/core/lib/iomgr/port.h"
// This test won't work except with posix sockets enabled
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_TCP_SERVER
#include "src/core/lib/iomgr/tcp_server.h"
@ -506,8 +506,8 @@ int main(int argc, char** argv) {
return EXIT_SUCCESS;
}
#else /* GRPC_POSIX_SOCKET */
#else /* GRPC_POSIX_SOCKET_SERVER */
int main(int argc, char** argv) { return 1; }
#endif /* GRPC_POSIX_SOCKET */
#endif /* GRPC_POSIX_SOCKET_SERVER */

6
test/core/iomgr/udp_server_test.cc
Unescape View File

@ -19,7 +19,7 @@
#include "src/core/lib/iomgr/port.h"
// This test won't work except with posix sockets enabled
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_UDP_SERVER
#include "src/core/lib/iomgr/udp_server.h"
@ -383,8 +383,8 @@ int main(int argc, char** argv) {
return 0;
}
#else /* GRPC_POSIX_SOCKET */
#else /* GRPC_POSIX_SOCKET_UDP_SERVER */
int main(int argc, char** argv) { return 1; }
#endif /* GRPC_POSIX_SOCKET */
#endif /* GRPC_POSIX_SOCKET_UDP_SERVER */

4
test/cpp/common/timer_test.cc
Unescape View File

@ -27,7 +27,7 @@
#include "src/core/lib/iomgr/timer_manager.h"
#include "test/core/util/test_config.h"
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_EV
#include "src/core/lib/iomgr/ev_posix.h"
#endif
@ -46,7 +46,7 @@ class TimerTest : public ::testing::Test {
grpc_init();
// Skip test if slowdown factor > 1, or we are
// using event manager.
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_EV
if (grpc_test_slowdown_factor() != 1 ||
grpc_event_engine_run_in_background()) {
#else

8
test/cpp/end2end/async_end2end_test.cc
Unescape View File

@ -43,9 +43,9 @@
#include "test/cpp/util/string_ref_helper.h"
#include "test/cpp/util/test_credentials_provider.h"
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_EV
#include "src/core/lib/iomgr/ev_posix.h"
#endif // GRPC_POSIX_SOCKET
#endif // GRPC_POSIX_SOCKET_EV
#include <gtest/gtest.h>
@ -362,14 +362,14 @@ TEST_P(AsyncEnd2endTest, ReconnectChannel) {
return;
}
int poller_slowdown_factor = 1;
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_EV
// It needs 2 pollset_works to reconnect the channel with polling engine
// "poll"
grpc_core::UniquePtr<char> poller = GPR_GLOBAL_CONFIG_GET(grpc_poll_strategy);
if (0 == strcmp(poller.get(), "poll")) {
poller_slowdown_factor = 2;
}
#endif // GRPC_POSIX_SOCKET
#endif // GRPC_POSIX_SOCKET_EV
ResetStub();
SendRpc(1);
server_->Shutdown();

8
test/cpp/end2end/end2end_test.cc
Unescape View File

@ -48,9 +48,9 @@
#include "test/cpp/util/string_ref_helper.h"
#include "test/cpp/util/test_credentials_provider.h"
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_EV
#include "src/core/lib/iomgr/ev_posix.h"
#endif // GRPC_POSIX_SOCKET
#endif // GRPC_POSIX_SOCKET_EV
#include <gtest/gtest.h>
@ -833,12 +833,12 @@ TEST_P(End2endTest, ReconnectChannel) {
int poller_slowdown_factor = 1;
// It needs 2 pollset_works to reconnect the channel with polling engine
// "poll"
#ifdef GRPC_POSIX_SOCKET
#ifdef GRPC_POSIX_SOCKET_EV
grpc_core::UniquePtr<char> poller = GPR_GLOBAL_CONFIG_GET(grpc_poll_strategy);
if (0 == strcmp(poller.get(), "poll")) {
poller_slowdown_factor = 2;
}
#endif // GRPC_POSIX_SOCKET
#endif // GRPC_POSIX_SOCKET_EV
ResetStub();
SendRpc(stub_.get(), 1, false);
RestartServer(std::shared_ptr<AuthMetadataProcessor>());

Write Preview
Loading…
Cancel
Save