summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Santos <thiagoss@osg.samsung.com>2016-02-23 12:42:19 -0300
committerThiago Santos <thiagoss@osg.samsung.com>2016-02-25 11:43:43 -0300
commitdff4c6d4991c91c4c9c484056abbc4cc34b0a544 (patch)
tree1ab6f683a3e8ef4f942008e674a7d3e4594bf0a1
parent7d948b025a3d4cfaedd156418266eaa607ab1f16 (diff)
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.
-rw-r--r--tests/check/elements/compositor.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/tests/check/elements/compositor.c b/tests/check/elements/compositor.c
index 0f5aad4a5..8b5fd5b26 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;
}