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.
This commit is contained in:
Thiago Santos 2016-02-23 12:42:19 -03:00
parent ea7e099307
commit 3d0f8cfc21

View file

@ -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);
tcase_add_test (tc_chain, test_start_time_first_live_drop_3_unlinked_1); 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; return s;
} }