diff options
Diffstat (limited to 'test/core/iomgr')
-rw-r--r-- | test/core/iomgr/endpoint_tests.c | 6 | ||||
-rw-r--r-- | test/core/iomgr/sockaddr_utils_test.c | 8 | ||||
-rw-r--r-- | test/core/iomgr/tcp_server_posix_test.c | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index e63048e26c..f9c5282f19 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -160,7 +160,7 @@ static void read_and_write_test_write_handler(void *data, GPR_ASSERT(error != GRPC_ENDPOINT_CB_ERROR); - gpr_log(GPR_DEBUG, "%s: error=%d", __FUNCTION__, error); + gpr_log(GPR_DEBUG, "%s: error=%d", "read_and_write_test_write_handler", error); if (error == GRPC_ENDPOINT_CB_SHUTDOWN) { gpr_log(GPR_INFO, "Write handler shutdown"); @@ -213,7 +213,7 @@ static void read_and_write_test(grpc_endpoint_test_config config, size_t slice_size, int shutdown) { struct read_and_write_test_state state; gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); - grpc_endpoint_test_fixture f = begin_test(config, __FUNCTION__, slice_size); + grpc_endpoint_test_fixture f = begin_test(config, "read_and_write_test", slice_size); if (shutdown) { gpr_log(GPR_INFO, "Start read and write shutdown test"); @@ -323,7 +323,7 @@ static void shutdown_during_write_test(grpc_endpoint_test_config config, shutdown_during_write_test_state read_st; shutdown_during_write_test_state write_st; gpr_slice *slices; - grpc_endpoint_test_fixture f = begin_test(config, __FUNCTION__, slice_size); + grpc_endpoint_test_fixture f = begin_test(config, "shutdown_during_write_test", slice_size); gpr_log(GPR_INFO, "testing shutdown during a write"); diff --git a/test/core/iomgr/sockaddr_utils_test.c b/test/core/iomgr/sockaddr_utils_test.c index 9212f01c3f..dfab340959 100644 --- a/test/core/iomgr/sockaddr_utils_test.c +++ b/test/core/iomgr/sockaddr_utils_test.c @@ -75,7 +75,7 @@ static void test_sockaddr_is_v4mapped(void) { struct sockaddr_in output4; struct sockaddr_in expect4; - gpr_log(GPR_INFO, "%s", __FUNCTION__); + gpr_log(GPR_INFO, "%s", "test_sockaddr_is_v4mapped"); /* v4mapped input should succeed. */ input6 = make_addr6(kMapped, sizeof(kMapped)); @@ -106,7 +106,7 @@ static void test_sockaddr_to_v4mapped(void) { struct sockaddr_in6 output6; struct sockaddr_in6 expect6; - gpr_log(GPR_INFO, "%s", __FUNCTION__); + gpr_log(GPR_INFO, "%s", "test_sockaddr_to_v4mapped"); /* IPv4 input should succeed. */ input4 = make_addr4(kIPv4, sizeof(kIPv4)); @@ -135,7 +135,7 @@ static void test_sockaddr_is_wildcard(void) { struct sockaddr dummy; int port; - gpr_log(GPR_INFO, "%s", __FUNCTION__); + gpr_log(GPR_INFO, "%s", "test_sockaddr_is_wildcard"); /* Generate wildcards. */ grpc_sockaddr_make_wildcards(555, &wild4, &wild6); @@ -192,7 +192,7 @@ static void test_sockaddr_to_string(void) { struct sockaddr_in6 input6; struct sockaddr dummy; - gpr_log(GPR_INFO, "%s", __FUNCTION__); + gpr_log(GPR_INFO, "%s", "test_sockaddr_to_string"); errno = 0x7EADBEEF; diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index 1c02c4b2f8..328b19f68a 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -43,7 +43,7 @@ #include <string.h> #include <unistd.h> -#define LOG_TEST() gpr_log(GPR_INFO, "%s", __FUNCTION__) +#define LOG_TEST(x) gpr_log(GPR_INFO, "%s", #x) static gpr_mu mu; static gpr_cv cv; @@ -66,7 +66,7 @@ static void test_no_op(void) { static void test_no_op_with_start(void) { grpc_tcp_server *s = grpc_tcp_server_create(); - LOG_TEST(); + LOG_TEST("test_no_op_with_start"); grpc_tcp_server_start(s, NULL, 0, on_connect, NULL); grpc_tcp_server_destroy(s, NULL, NULL); } @@ -74,7 +74,7 @@ static void test_no_op_with_start(void) { static void test_no_op_with_port(void) { struct sockaddr_in addr; grpc_tcp_server *s = grpc_tcp_server_create(); - LOG_TEST(); + LOG_TEST("test_no_op_with_port"); memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; @@ -87,7 +87,7 @@ static void test_no_op_with_port(void) { static void test_no_op_with_port_and_start(void) { struct sockaddr_in addr; grpc_tcp_server *s = grpc_tcp_server_create(); - LOG_TEST(); + LOG_TEST("test_no_op_with_port_and_start"); memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; @@ -107,7 +107,7 @@ static void test_connect(int n) { int nconnects_before; gpr_timespec deadline; int i; - LOG_TEST(); + LOG_TEST("test_connect"); gpr_log(GPR_INFO, "clients=%d", n); gpr_mu_lock(&mu); |