From 2dab691ee8f36d7c4b690ff4bd0c93386a2e31f4 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 8 Mar 2013 10:09:01 -0800 Subject: [PATCH] Solaris/Illumos/Nexenta creates pipes that are bi-directional by default. Ensure the test code will pass against such a system (allow writes/reads going both ways). Signed-off-by: Jeremy Allison --- lib/tevent/testsuite.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c index 8e3f4af..1fcfa1c 100644 --- a/lib/tevent/testsuite.c +++ b/lib/tevent/testsuite.c @@ -60,22 +60,28 @@ static void fde_handler_write(struct tevent_context *ev_ctx, struct tevent_fd *f } -/* These should never fire... */ +/* This will only fire if the fd's returned from pipe() are bi-directional. */ static void fde_handler_read_1(struct tevent_context *ev_ctx, struct tevent_fd *f, uint16_t flags, void *private_data) { - struct torture_context *test = (struct torture_context *)private_data; - torture_comment(test, "fde_handler_read_1 should never fire !\n"); - abort(); + int *fd = (int *)private_data; + char c; +#ifdef SA_SIGINFO + kill(getpid(), SIGUSR1); +#endif + kill(getpid(), SIGALRM); + + read(fd[1], &c, 1); + fde_count++; } -/* These should never fire... */ +/* This will only fire if the fd's returned from pipe() are bi-directional. */ static void fde_handler_write_1(struct tevent_context *ev_ctx, struct tevent_fd *f, uint16_t flags, void *private_data) { - struct torture_context *test = (struct torture_context *)private_data; - torture_comment(test, "fde_handler_write_1 should never fire !\n"); - abort(); + int *fd = (int *)private_data; + char c = 0; + write(fd[0], &c, 1); } static void finished_handler(struct tevent_context *ev_ctx, struct tevent_timer *te, @@ -133,12 +139,12 @@ static bool test_event_context(struct torture_context *test, fde_read = tevent_add_fd(ev_ctx, ev_ctx, fd[0], TEVENT_FD_READ, fde_handler_read, fd); fde_write_1 = tevent_add_fd(ev_ctx, ev_ctx, fd[0], TEVENT_FD_WRITE, - fde_handler_write_1, test); + fde_handler_write_1, fd); fde_write = tevent_add_fd(ev_ctx, ev_ctx, fd[1], TEVENT_FD_WRITE, fde_handler_write, fd); fde_read_1 = tevent_add_fd(ev_ctx, ev_ctx, fd[1], TEVENT_FD_READ, - fde_handler_read_1, test); + fde_handler_read_1, fd); tevent_fd_set_auto_close(fde_read); tevent_fd_set_auto_close(fde_write); -- 1.8.1.3