From 3d0f8cfc21d4bccdde5de84f6c68f4d6468b174c Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Tue, 23 Feb 2016 12:42:19 -0300 Subject: [PATCH] tests: compositor: drop special case for valgrind timeout The default one is 6 minutes, the test was using 5 minutes so just resort to using the default. For the non-valgrind test also use the default 20 secs instead of reducing it to 6s. No real reason to set a custom value here. --- tests/check/elements/compositor.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tests/check/elements/compositor.c b/tests/check/elements/compositor.c index 0f5aad4a51..8b5fd5b26a 100644 --- a/tests/check/elements/compositor.c +++ b/tests/check/elements/compositor.c @@ -1902,17 +1902,6 @@ compositor_suite (void) tcase_add_test (tc_chain, test_start_time_first_live_drop_3); tcase_add_test (tc_chain, test_start_time_first_live_drop_3_unlinked_1); - /* Use a longer timeout */ -#ifdef HAVE_VALGRIND - if (RUNNING_ON_VALGRIND) { - tcase_set_timeout (tc_chain, 5 * 60); - } else -#endif - { - /* this is shorter than the default 60 seconds?! (tpm) */ - /* tcase_set_timeout (tc_chain, 6); */ - } - return s; }