diff options
| -rw-r--r-- | lib/igt_core.c | 17 | ||||
| -rw-r--r-- | lib/igt_core.h | 1 | ||||
| -rw-r--r-- | tests/gem_sync.c | 2 |
3 files changed, 19 insertions, 1 deletions
diff --git a/lib/igt_core.c b/lib/igt_core.c index 8e0bd2e8..5bbf13b5 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -1131,6 +1131,9 @@ void igt_exit(void) kmsg(KERN_INFO "%s: exiting, ret=%d\n", command_str, igt_exitcode); igt_debug("Exiting with status code %d\n", igt_exitcode); + for (int c = 0; c < num_test_children; c++) + kill(test_children[c], SIGKILL); + if (!test_with_subtests) { struct timespec now; const char *result; @@ -1401,6 +1404,20 @@ void igt_waitchildren(void) igt_fail(err); } +/** + * igt_waitchildren_timeout: + * + * Wait for all children forked with igt_fork, for a maximum of @seconds. + * + * Wraps igt_waitchildren() and igt_set_timeout() + */ +void igt_waitchildren_timeout(int seconds, const char *reason) +{ + igt_set_timeout(seconds, reason); + igt_waitchildren(); + igt_reset_timeout(); +} + /* exit handler code */ #define MAX_SIGNALS 32 #define MAX_EXIT_HANDLERS 10 diff --git a/lib/igt_core.h b/lib/igt_core.h index 8f297e06..9d4c9636 100644 --- a/lib/igt_core.h +++ b/lib/igt_core.h @@ -610,6 +610,7 @@ bool __igt_fork(void); for (int child = 0; child < (num_children); child++) \ for (; __igt_fork(); exit(0)) void igt_waitchildren(void); +void igt_waitchildren_timeout(int seconds, const char *reason); /** * igt_helper_process: diff --git a/tests/gem_sync.c b/tests/gem_sync.c index 84b689e1..af3c47ed 100644 --- a/tests/gem_sync.c +++ b/tests/gem_sync.c @@ -155,7 +155,7 @@ sync_ring(int fd, unsigned ring, int num_children) gem_close(fd, object.handle); } - igt_waitchildren(); + igt_waitchildren_timeout(20, NULL); igt_assert_eq(intel_detect_and_clear_missed_interrupts(fd), 0); } |