Fixing echo test.

pull/301/head
Nicolas "Pixel" Noble 10 years ago
parent 904b711cdd
commit 2b16bc4656
  1. 30
      test/core/echo/echo_test.c

@ -49,18 +49,19 @@
#include "test/core/util/port.h" #include "test/core/util/port.h"
int test_client(const char *root, const char *host, int port) { int test_client(const char *root, const char *host, int port) {
char *args[3];
int status; int status;
pid_t cli; pid_t cli;
cli = fork(); cli = fork();
if (cli == 0) { if (cli == 0) {
gpr_asprintf(&args[0], "%s/echo_client", root); char *binary_path;
gpr_join_host_port(&args[1], host, port); char *binding;
args[2] = 0; gpr_asprintf(&binary_path, "%s/echo_client", root);
execv(args[0], args); gpr_join_host_port(&binding, host, port);
gpr_free(args[0]); execl(binary_path, binary_path, binding, NULL);
gpr_free(args[1]);
gpr_free(binary_path);
gpr_free(binding);
return 1; return 1;
} }
/* wait for client */ /* wait for client */
@ -76,7 +77,6 @@ int main(int argc, char **argv) {
char *lslash = strrchr(me, '/'); char *lslash = strrchr(me, '/');
char root[1024]; char root[1024];
int port = grpc_pick_unused_port_or_die(); int port = grpc_pick_unused_port_or_die();
char *args[3];
int status; int status;
pid_t svr; pid_t svr;
int ret; int ret;
@ -98,13 +98,15 @@ int main(int argc, char **argv) {
/* start the server */ /* start the server */
svr = fork(); svr = fork();
if (svr == 0) { if (svr == 0) {
gpr_asprintf(&args[0], "%s/echo_server", root); char *binary_path;
gpr_join_host_port(&args[1], "::", port); char *binding;
args[2] = 0; gpr_asprintf(&binary_path, "%s/echo_server", root);
execv(args[0], args); gpr_join_host_port(&binding, "::", port);
execl(binary_path, binary_path, "-bind", binding, NULL);
gpr_free(args[0]); gpr_free(binary_path);
gpr_free(args[1]); gpr_free(binding);
return 1; return 1;
} }
/* wait a little */ /* wait a little */

Loading…
Cancel
Save