From 034807d6d38270880ac2e76034b8261033e8f928 Mon Sep 17 00:00:00 2001 From: Deng Zhengrong Date: Sun, 29 Jul 2012 06:12:53 +0800 Subject: [PATCH] tests: modify interpol-test to use 'check' framework --- src/Makefile.am | 4 +-- src/tests/interpol-test.c | 69 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 50 insertions(+), 23 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 8009b87..2cc3983 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -451,8 +451,8 @@ sync_playback_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS) interpol_test_SOURCES = tests/interpol-test.c interpol_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la -interpol_test_CFLAGS = $(AM_CFLAGS) -interpol_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) +interpol_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS) +interpol_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS) sig2str_test_SOURCES = tests/sig2str-test.c sig2str_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulse.la libpulsecommon-@PA_MAJORMINOR@.la diff --git a/src/tests/interpol-test.c b/src/tests/interpol-test.c index ad00aca..6303c5e 100644 --- a/src/tests/interpol-test.c +++ b/src/tests/interpol-test.c @@ -28,6 +28,8 @@ #include #include +#include + #include #include @@ -43,6 +45,7 @@ static pa_stream *stream = NULL; static pa_mainloop_api *mainloop_api = NULL; static pa_bool_t playback = TRUE; static pa_usec_t latency = 0; +static const char *bname = NULL; static void stream_write_cb(pa_stream *p, size_t nbytes, void *userdata) { /* Just some silence */ @@ -50,14 +53,14 @@ static void stream_write_cb(pa_stream *p, size_t nbytes, void *userdata) { for (;;) { void *data; - pa_assert_se((nbytes = pa_stream_writable_size(p)) != (size_t) -1); + fail_unless((nbytes = pa_stream_writable_size(p)) != (size_t) -1); if (nbytes <= 0) break; - pa_assert_se(pa_stream_begin_write(p, &data, &nbytes) == 0); + fail_unless(pa_stream_begin_write(p, &data, &nbytes) == 0); pa_memzero(data, nbytes); - pa_assert_se(pa_stream_write(p, data, nbytes, NULL, 0, PA_SEEK_RELATIVE) == 0); + fail_unless(pa_stream_write(p, data, nbytes, NULL, 0, PA_SEEK_RELATIVE) == 0); } } @@ -72,8 +75,8 @@ static void stream_read_cb(pa_stream *p, size_t nbytes, void *userdata) { if (nbytes <= 0) break; - pa_assert_se(pa_stream_peek(p, &data, &nbytes) == 0); - pa_assert_se(pa_stream_drop(p) == 0); + fail_unless(pa_stream_peek(p, &data, &nbytes) == 0); + fail_unless(pa_stream_drop(p) == 0); } } @@ -88,7 +91,7 @@ static void stream_latency_cb(pa_stream *p, void *userdata) { /* This is called whenever the context status changes */ static void context_state_callback(pa_context *c, void *userdata) { - pa_assert(c); + fail_unless(c != NULL); switch (pa_context_get_state(c)) { case PA_CONTEXT_CONNECTING: @@ -121,7 +124,8 @@ static void context_state_callback(pa_context *c, void *userdata) { pa_log("Connection established"); - pa_assert_se(stream = pa_stream_new(c, "interpol-test", &ss, NULL)); + stream = pa_stream_new(c, "interpol-test", &ss, NULL); + fail_unless(stream != NULL); if (playback) { pa_assert_se(pa_stream_connect_playback(stream, NULL, &attr, flags, NULL, NULL) == 0); @@ -142,11 +146,11 @@ static void context_state_callback(pa_context *c, void *userdata) { case PA_CONTEXT_FAILED: default: pa_log_error("Context error: %s", pa_strerror(pa_context_errno(c))); - abort(); + fail(); } } -int main(int argc, char *argv[]) { +START_TEST (interpol_test) { pa_threaded_mainloop* m = NULL; int k; struct timeval start, last_info = { 0, 0 }; @@ -155,24 +159,21 @@ int main(int argc, char *argv[]) { pa_bool_t corked = FALSE; #endif - if (!getenv("MAKE_CHECK")) - pa_log_set_level(PA_LOG_DEBUG); - - playback = argc <= 1 || !pa_streq(argv[1], "-r"); - latency = (argc >= 2 && !pa_streq(argv[1], "-r")) ? atoi(argv[1]) : (argc >= 3 ? atoi(argv[2]) : 0); - /* Set up a new main loop */ - pa_assert_se(m = pa_threaded_mainloop_new()); - pa_assert_se(mainloop_api = pa_threaded_mainloop_get_api(m)); - pa_assert_se(context = pa_context_new(mainloop_api, argv[0])); + m = pa_threaded_mainloop_new(); + fail_unless(m != NULL); + mainloop_api = pa_threaded_mainloop_get_api(m); + fail_unless(mainloop_api != NULL); + context = pa_context_new(mainloop_api, bname); + fail_unless(context != NULL); pa_context_set_state_callback(context, context_state_callback, NULL); - pa_assert_se(pa_context_connect(context, NULL, 0, NULL) >= 0); + fail_unless(pa_context_connect(context, NULL, 0, NULL) >= 0); pa_gettimeofday(&start); - pa_assert_se(pa_threaded_mainloop_start(m) >= 0); + fail_unless(pa_threaded_mainloop_start(m) >= 0); /* #ifdef CORK */ for (k = 0; k < 20000; k++) @@ -264,6 +265,32 @@ int main(int argc, char *argv[]) { if (m) pa_threaded_mainloop_free(m); +} +END_TEST + +int main(int argc, char *argv[]) { + int failed = 0; + Suite *s; + TCase *tc; + SRunner *sr; + + if (!getenv("MAKE_CHECK")) + pa_log_set_level(PA_LOG_DEBUG); + + bname = argv[0]; + playback = argc <= 1 || !pa_streq(argv[1], "-r"); + latency = (argc >= 2 && !pa_streq(argv[1], "-r")) ? atoi(argv[1]) : (argc >= 3 ? atoi(argv[2]) : 0); + + s = suite_create("Interpol"); + tc = tcase_create("interpol"); + tcase_add_test(tc, interpol_test); + tcase_set_timeout(tc, 5 * 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 0; + return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.7.4