flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-08 00:16:18 +00:00
Code Issues Releases Wiki Activity

lib: exit immediately if igt_fail is called in an exit handler

Browse Source 
Exit immediately if the test is already exiting and igt_fail is called.
This can happen if an igt_assert fails in an exit handler.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91349
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Thomas Wood 2015-07-16 17:39:59 +01:00
parent 51576b7ad6
commit e65c69b995
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/igt_core.c
View File

@ -221,6 +221,7 @@ static const char *in_subtest = NULL;
static struct timespec subtest_time; static struct timespec subtest_time;
static bool in_fixture = false; static bool in_fixture = false;
static bool test_with_subtests = false; static bool test_with_subtests = false;
static bool in_atexit_handler = false;
static enum { static enum {
CONT = 0, SKIP, FAIL CONT = 0, SKIP, FAIL
} skip_subtests_henceforth = CONT; } skip_subtests_henceforth = CONT;
@ -945,6 +946,11 @@ void igt_fail(int exitcode)
igt_debug_wait_for_keypress("failure"); igt_debug_wait_for_keypress("failure");
/* Exit immediately if the test is already exiting and igt_fail is
* called. This can happen if an igt_assert fails in an exit handler */
if (in_atexit_handler)
_exit(IGT_EXIT_FAILURE);
if (!failed_one) if (!failed_one)
igt_exitcode = exitcode; igt_exitcode = exitcode;
@ -1410,6 +1416,8 @@ static void call_exit_handlers(int sig)
static void igt_atexit_handler(void) static void igt_atexit_handler(void)
{ {
in_atexit_handler = true;
restore_all_sig_handler(); restore_all_sig_handler();
if (!exit_handler_disabled) if (!exit_handler_disabled)