public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: IGT development <igt-dev@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Subject: [igt-dev] [PATCH i-g-t 4/7] lib/tests: make sure we catch igt_fork leaks
Date: Thu,  7 Feb 2019 17:50:57 +0100	[thread overview]
Message-ID: <20190207165100.20407-4-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20190207165100.20407-1-daniel.vetter@ffwll.ch>

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.

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..e5b0ab016b23 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 == IGT_EXIT_FAILURE);
 }
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

  parent reply	other threads:[~2019-02-07 16:51 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-07 16:50 [igt-dev] [PATCH i-g-t 1/7] lib/tests: Check that igt_assert forwards correctly through igt_fork Daniel Vetter
2019-02-07 16:50 ` [igt-dev] [PATCH i-g-t 2/7] lib/tests: make sure igt_skip in igt_fork is forbidden Daniel Vetter
2019-02-07 16:50 ` [igt-dev] [PATCH i-g-t 3/7] lib: Don't leak children in igt_waitchildren_timeout Daniel Vetter
2019-02-07 16:50 ` Daniel Vetter [this message]
2019-02-07 16:50 ` [igt-dev] [PATCH i-g-t 5/7] lib: Make sure we leak no child processes Daniel Vetter
2019-02-07 16:50 ` [igt-dev] [PATCH i-g-t 6/7] lib: Drop igt_child_done Daniel Vetter
2019-02-07 16:51 ` [igt-dev] [PATCH i-g-t 7/7] lib: Drop IGT_EXIT_TIMEOUT Daniel Vetter
2019-02-07 17:10 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/7] lib/tests: Check that igt_assert forwards correctly through igt_fork Patchwork
2019-02-07 18:44 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190207165100.20407-4-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=daniel.vetter@intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox