Merge pull request #16681 from arrowd/master

Fix various tests on FreeBSD.
6 years ago · ec06d677e2
parent e8b2bced4d 39eb19ed35
commit ec06d677e2
5 changed files with 10 additions and 4 deletions
--- a/test/core/iomgr/socket_utils_test.cc
+++ b/test/core/iomgr/socket_utils_test.cc
@ -24,6 +24,7 @@
 #include "src/core/lib/iomgr/socket_utils_posix.h"

 #include <errno.h>
+#include <netinet/in.h>
 #include <netinet/ip.h>
 #include <string.h>

--- a/test/cpp/interop/interop_test.cc
+++ b/test/cpp/interop/interop_test.cc
@ -16,10 +16,6 @@
 *
 */

-#ifndef _POSIX_SOURCE
-#define _POSIX_SOURCE
-#endif
-
 #include <assert.h>
 #include <signal.h>
 #include <stdio.h>
--- a/test/cpp/naming/address_sorting_test.cc
+++ b/test/cpp/naming/address_sorting_test.cc
@ -52,6 +52,7 @@

 #ifndef GPR_WINDOWS
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
 #endif

--- a/test/cpp/naming/resolver_component_tests_runner_invoker.cc
+++ b/test/cpp/naming/resolver_component_tests_runner_invoker.cc
@ -29,6 +29,10 @@
 #include <thread>
 #include <vector>

+#ifdef __FreeBSD__
+#include <sys/wait.h>
+#endif
+
 #include "test/cpp/util/subprocess.h"
 #include "test/cpp/util/test_config.h"

--- a/test/cpp/qps/json_run_localhost.cc
+++ b/test/cpp/qps/json_run_localhost.cc
@ -24,6 +24,10 @@
 #include <sstream>
 #include <string>

+#ifdef __FreeBSD__
+#include <sys/wait.h>
+#endif
+
 #include <grpc/support/log.h>

 #include "src/core/lib/gpr/env.h"