Commit fee7466a authored by Daniel Vetter's avatar Daniel Vetter

tests/i915_missed_irq: Don't leave the hang detector hanging

Spotted by my new "are there any child processes left?" check in
igt_exit - we need to put all the igt_require before we start any real
test logic.

v2: Rebase.
Reviewed-by: Chris Wilson's avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@intel.com>
parent 3e841ea2
......@@ -61,6 +61,22 @@ static void igt_fork_vs_assert(void)
igt_waitchildren();
}
static void igt_fork_leak(void)
{
igt_fork(i, 1) {
sleep(10);
}
}
static void igt_fork_timeout_leak(void)
{
igt_fork(i, 1) {
sleep(10);
}
igt_waitchildren_timeout(1, "library test");
}
static int do_fork(void (*test_to_run)(void))
{
int pid, status;
......@@ -95,4 +111,12 @@ int main(int argc, char **argv)
/* check that igt_skip within a fork blows up */
ret = do_fork(igt_fork_vs_skip);
internal_assert(WEXITSTATUS(ret) == SIGABRT + 128);
/* check that failure to clean up fails */
ret = do_fork(igt_fork_leak);
internal_assert(WTERMSIG(ret) == SIGABRT);
/* check that igt_waitchildren_timeout cleans up*/
ret = do_fork(igt_fork_timeout_leak);
internal_assert(WEXITSTATUS(ret) == SIGKILL + 128);
}
......@@ -108,13 +108,13 @@ igt_simple_main
igt_require_gem(device);
igt_skip_on(gem_has_guc_submission(device)); /* irq forced for guc */
gem_require_mmap_wc(device);
igt_fork_hang_detector(device);
debugfs = igt_debugfs_dir(device);
expect_rings = engine_mask(debugfs);
igt_require(expect_rings);
igt_fork_hang_detector(device);
igt_debug("Clearing rings %x\n", expect_rings);
intel_detect_and_clear_missed_interrupts(device);
for (e = intel_execution_engines; e->name; e++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment