From 86289903652b05a16bbe1102de26df52a3985e7d Mon Sep 17 00:00:00 2001 From: Deng Zhengrong Date: Sat, 28 Jul 2012 21:16:31 +0800 Subject: [PATCH] tests: modify asyncmsgq-test to new 'check' framework --- src/Makefile.am | 4 ++-- src/tests/asyncmsgq-test.c | 30 ++++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index a12faf28..62b46701 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -370,9 +370,9 @@ asyncq_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libp asyncq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) asyncmsgq_test_SOURCES = tests/asyncmsgq-test.c -asyncmsgq_test_CFLAGS = $(AM_CFLAGS) +asyncmsgq_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS) asyncmsgq_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la -asyncmsgq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +asyncmsgq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS) queue_test_SOURCES = tests/queue-test.c queue_test_CFLAGS = $(AM_CFLAGS) diff --git a/src/tests/asyncmsgq-test.c b/src/tests/asyncmsgq-test.c index 9fbe5bc8..3bba7535 100644 --- a/src/tests/asyncmsgq-test.c +++ b/src/tests/asyncmsgq-test.c @@ -25,6 +25,8 @@ #include #include +#include + #include #include #include @@ -71,13 +73,15 @@ static void the_thread(void *_q) { } while (!quit); } -int main(int argc, char *argv[]) { +START_TEST (asyncmsgq_test) { pa_asyncmsgq *q; pa_thread *t; - pa_assert_se(q = pa_asyncmsgq_new(0)); + q = pa_asyncmsgq_new(0); + fail_unless(q != NULL); - pa_assert_se(t = pa_thread_new("test", the_thread, q)); + t = pa_thread_new("test", the_thread, q); + fail_unless(t != NULL); pa_log_info("Operation A post"); pa_asyncmsgq_post(q, NULL, OPERATION_A, NULL, 0, NULL, NULL); @@ -100,6 +104,24 @@ int main(int argc, char *argv[]) { pa_thread_free(t); pa_asyncmsgq_unref(q); +} +END_TEST - return 0; +int main(int argc, char *argv[]) { + int failed = 0; + Suite *s; + TCase *tc; + SRunner *sr; + + s = suite_create("Async Message Queue"); + tc = tcase_create("asyncmsgq"); + tcase_add_test(tc, asyncmsgq_test); + 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