diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-10-26 13:40:30 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-10-26 13:40:30 +0100 |
| commit | b32eec982c38460624bab3fe8af7d497376078a3 (patch) | |
| tree | 314b894391a2baeaa719d4e3658d5d8e37ecb915 | |
| parent | fd24210dc6e9583fdd7ef97d59b787def96dff3d (diff) | |
DTMF player test: use tp_tests_abort_after()
| -rw-r--r-- | tests/dtmf-player.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/dtmf-player.c b/tests/dtmf-player.c index c341b625a..159aa3ddc 100644 --- a/tests/dtmf-player.c +++ b/tests/dtmf-player.c @@ -292,13 +292,6 @@ test_wait (Fixture *f, "finished\n"); } -static gboolean -timeout_cb (gpointer nil G_GNUC_UNUSED) -{ - g_error ("timed out"); - g_assert_not_reached (); -} - int main (int argc, char **argv) @@ -307,11 +300,10 @@ main (int argc, #define FIXTURE_TEST(x) \ g_test_add (TEST_PREFIX #x, Fixture, NULL, setup, test_ ## x, teardown) + tp_tests_abort_after (10); g_test_init (&argc, &argv, NULL); g_test_bug_base ("http://bugs.freedesktop.org/show_bug.cgi?id="); - g_timeout_add_seconds (10, timeout_cb, NULL); - g_test_add_func (TEST_PREFIX "to_char", test_to_char); FIXTURE_TEST (noop); |