flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-07-26 03:07:24 +00:00
Code Issues Releases Wiki Activity

lib: only skip subsequent tests if a timeout occurs outside of a subtest

Browse Source 
Make timeout behaviour more consistent with igt_fail, where subsequent
subtests are only skipped if the failure occurs outside of a subtest.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85718
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Thomas Wood 2014-11-13 11:47:19 +00:00
parent f6aa80ca18
commit ebab9f080b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/igt_core.c
View File

@ -1481,9 +1481,6 @@ void igt_vlog(enum igt_log_level level, const char *format, va_list args)
static void igt_alarm_handler(int signal) static void igt_alarm_handler(int signal)
{ {
/* subsequent tests are skipped */
skip_subtests_henceforth = SKIP;
/* exit with timeout status */ /* exit with timeout status */
igt_fail(IGT_EXIT_TIMEOUT); igt_fail(IGT_EXIT_TIMEOUT);
} }
@ -1492,11 +1489,13 @@ static void igt_alarm_handler(int signal)
* igt_set_timeout: * igt_set_timeout:
* @seconds: number of seconds before timeout * @seconds: number of seconds before timeout
* *
* Stop the current test and skip any subsequent tests after the specified * Fail a test and exit with #IGT_EXIT_TIMEOUT status after the specified
* number of seconds have elapsed. The test will exit with #IGT_EXIT_TIMEOUT * number of seconds have elapsed. If the current test has subtests and the
* status. Any previous timer is cancelled and no timeout is scheduled if * timeout occurs outside a subtest, subsequent subtests will be skipped and
* @seconds is zero. * marked as failed.
* *
* Any previous timer is cancelled and no timeout is scheduled if @seconds is
* zero.
*/ */
void igt_set_timeout(unsigned int seconds) void igt_set_timeout(unsigned int seconds)
{ {