X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Foserver%2Ftest%2Frun.c;fp=ccan%2Foserver%2Ftest%2Frun.c;h=ee3959ec10ce888b5281bad6e61b6f326240d9a4;hb=0b1cb00c4391dee4d633f92c5c42c7a0d4ff4861;hp=dc6031b9de547e715a4e6f54c80389afcc62fc4c;hpb=55629c7a4496e0b559f30a8bf33af6cb3888d063;p=ccan-lca-2011.git diff --git a/ccan/oserver/test/run.c b/ccan/oserver/test/run.c index dc6031b..ee3959e 100644 --- a/ccan/oserver/test/run.c +++ b/ccan/oserver/test/run.c @@ -12,12 +12,11 @@ int main(void) { int fd; - int status; char buf[200]; const char *input; /* This is how many tests you plan to run */ - plan_tests(4 * 6); + plan_tests(3 * 6); foreach_ptr(input, "This is a test\n", @@ -31,13 +30,7 @@ int main(void) write(fd, input, strlen(input)); lseek(fd, 0, SEEK_SET); - if (fork() == 0) - oserver_serve(fd); - - wait(&status); - - ok1(WIFEXITED(status)); - ok1(WEXITSTATUS(status) == 0); + ok1(oserver_serve(fd)); lseek(fd, 0, SEEK_SET); buf[read(fd, buf, sizeof(buf)-1)] = '\0';