From d9841a943191212ee8ef872255400cac5d8a02c4 Mon Sep 17 00:00:00 2001 From: Deng Zhengrong Date: Sun, 29 Jul 2012 06:48:07 +0800 Subject: [PATCH] tests: modify rtpoll-test to use 'check' framework --- src/Makefile.am | 4 ++-- src/tests/rtpoll-test.c | 27 +++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index be96fb36..d91c2262 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -380,9 +380,9 @@ queue_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpu queue_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS) rtpoll_test_SOURCES = tests/rtpoll-test.c -rtpoll_test_CFLAGS = $(AM_CFLAGS) +rtpoll_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS) rtpoll_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la -rtpoll_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +rtpoll_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS) mcalign_test_SOURCES = tests/mcalign-test.c mcalign_test_CFLAGS = $(AM_CFLAGS) diff --git a/src/tests/rtpoll-test.c b/src/tests/rtpoll-test.c index 6a6b73a8..2ac34f0e 100644 --- a/src/tests/rtpoll-test.c +++ b/src/tests/rtpoll-test.c @@ -21,6 +21,7 @@ #include #endif +#include #include #include @@ -41,7 +42,7 @@ static int worker(pa_rtpoll_item *w) { return 0; } -int main(int argc, char *argv[]) { +START_TEST (rtpoll_test) { pa_rtpoll *p; pa_rtpoll_item *i, *w; struct pollfd *pollfd; @@ -80,6 +81,28 @@ int main(int argc, char *argv[]) { pa_rtpoll_item_free(w); pa_rtpoll_free(p); +} +END_TEST - return 0; +int main(int argc, char *argv[]) { + int failed = 0; + Suite *s; + TCase *tc; + SRunner *sr; + + s = suite_create("RT Poll"); + tc = tcase_create("rtpoll"); + tcase_add_test(tc, rtpoll_test); + /* the default timeout is too small, + * set it to a reasonable large one. + */ + tcase_set_timeout(tc, 60 * 60); + suite_add_tcase(s, tc); + + sr = srunner_create(s); + srunner_run_all(sr, CK_NORMAL); + failed = srunner_ntests_failed(sr); + srunner_free(sr); + + return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.39.2