From bbbdff88b1d90cd9f843aab3c06f02dada3741ad Mon Sep 17 00:00:00 2001 From: Marek Chalupa Date: Wed, 24 Sep 2014 14:37:07 +0200 Subject: [PATCH] tests: use test_set_timeout in display-test replace call to alarm() with test_set_timeout() Signed-off-by: Marek Chalupa Acked-by: Giulio Camuffo --- tests/display-test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/display-test.c b/tests/display-test.c index f8aac64..aecf341 100644 --- a/tests/display-test.c +++ b/tests/display-test.c @@ -410,7 +410,7 @@ threading_post_err(void) /* kill test in 3 seconds. This should be enough time for the * thread to exit if it's not blocking. If everything is OK, than * the thread was woken up and the test will end before the SIGALRM */ - alarm(3); + test_set_timeout(3); pthread_join(thread, NULL); wl_proxy_destroy((struct wl_proxy *) c->tc); @@ -462,7 +462,7 @@ threading_cancel_read(void) /* kill test in 3 seconds. This should be enough time for the * thread to exit if it's not blocking. If everything is OK, than * the thread was woken up and the test will end before the SIGALRM */ - alarm(3); + test_set_timeout(3); pthread_join(th1, NULL); pthread_join(th2, NULL); pthread_join(th3, NULL); @@ -501,7 +501,7 @@ threading_read_eagain(void) * set it - check if we're testing the right case */ assert(errno == EAGAIN); - alarm(3); + test_set_timeout(3); pthread_join(th1, NULL); pthread_join(th2, NULL); pthread_join(th3, NULL); @@ -562,7 +562,7 @@ threading_read_after_error(void) assert(wl_display_read_events(c->wl_display) == -1); /* kill test in 3 seconds */ - alarm(3); + test_set_timeout(3); pthread_join(thread, NULL); wl_proxy_destroy((struct wl_proxy *) c->tc); -- 2.7.4