[igt-dev] [PATCH i-g-t] lib/tests: make sure we catch igt_fork leaks

Daniel Vetter
2019-02-12T16:01:00Z

Tests have to call igt_waitchildren(_timeout) before they finish
(either with success or an igt_fail/assert/skip/whatever).

Make sure we catch this.

v2: Another testcase to make sure igt_waitchildren_timeout cleans up.

v3: Actually test that igt_waitchildren_timeout kills children - we
want a proper IGT_EXIT_FAILURE, not some assert.

v4: Adjust testcase, exit code is back to SIGKILL + 128.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
lib/tests/igt_fork.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)

diff --git a/lib/tests/igt_fork.c b/lib/tests/igt_fork.c
index 5ff2956dd0ab..8ff4cbfad36b 100644
--- a/lib/tests/igt_fork.c
+++ b/lib/tests/igt_fork.c
@@ -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;
@@ -98,4 +114,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(ret == SIGABRT + 128);
+
+ /* check that failure to clean up fails */
+ ret = do_fork(igt_fork_leak);
+ internal_assert(ret == SIGABRT + 128);
+
+ /* check that igt_waitchildren_timeout cleans up*/
+ ret = do_fork(igt_fork_timeout_leak);
+ internal_assert(ret == SIGKILL + 128);
}
--
2.20.1