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 1/9] lib/tests: Drop NIH exit status handling
Date: Wed, 13 Feb 2019 11:35:43 +0100	[thread overview]
Message-ID: <20190213103551.5438-1-daniel.vetter@ffwll.ch> (raw)

Spotted by Chris.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 lib/tests/igt_assert.c     |  9 +++------
 lib/tests/igt_segfault.c   |  8 ++++----
 lib/tests/igt_simulation.c | 39 +++++++++++++++++++++++---------------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/lib/tests/igt_assert.c b/lib/tests/igt_assert.c
index 306b1fb8533c..0082fda14851 100644
--- a/lib/tests/igt_assert.c
+++ b/lib/tests/igt_assert.c
@@ -79,10 +79,7 @@ static int do_fork(void)
 		       errno == EINTR)
 			;
 
-		if(WIFSIGNALED(status))
-			return WTERMSIG(status) + 128;
-
-		return WEXITSTATUS(status);
+		return status;
 	}
 }
 
@@ -161,7 +158,7 @@ igt_main
 	test_to_run = test_cmpint_negative;
 	ret = do_fork();
 	igt_subtest("igt_cmpint_negative")
-		internal_assert(ret == IGT_EXIT_FAILURE);
+		internal_assert(WEXITSTATUS(ret) == IGT_EXIT_FAILURE);
 
 	igt_subtest("igt_assert_fd")
 		test_fd();
@@ -169,5 +166,5 @@ igt_main
 	test_to_run = test_fd_negative;
 	ret = do_fork();
 	igt_subtest("igt_assert_fd_negative")
-		internal_assert(ret == IGT_EXIT_FAILURE);
+		internal_assert(WEXITSTATUS(ret) == IGT_EXIT_FAILURE);
 }
diff --git a/lib/tests/igt_segfault.c b/lib/tests/igt_segfault.c
index d07677dad0cb..86fee5354d67 100644
--- a/lib/tests/igt_segfault.c
+++ b/lib/tests/igt_segfault.c
@@ -116,20 +116,20 @@ int main(int argc, char **argv)
 	runc=false;
 	igt_info("Simple test.\n");
 	fflush(stdout);
-	internal_assert(do_fork() == SIGSEGV + 128);
+	internal_assert(WTERMSIG(do_fork()) == SIGSEGV);
 
 	/* Test crash in a single subtest is reported */
 	simple = false;
 	igt_info("Single subtest.\n");
 	fflush(stdout);
-	internal_assert(do_fork() == SIGSEGV + 128);
+	internal_assert(WTERMSIG(do_fork()) == SIGSEGV);
 
 	/* Test crash in a subtest following a pass is reported */
 	simple = false;
 	runa=true;
 	igt_info("Passing then crashing subtest.\n");
 	fflush(stdout);
-	internal_assert(do_fork() == SIGSEGV + 128);
+	internal_assert(WTERMSIG(do_fork()) == SIGSEGV);
 
 	/* Test crash in a subtest preceeding a pass is reported */
 	simple = false;
@@ -137,7 +137,7 @@ int main(int argc, char **argv)
 	runc=true;
 	igt_info("Crashing then passing subtest.\n");
 	fflush(stdout);
-	internal_assert(do_fork() == SIGSEGV + 128);
+	internal_assert(WTERMSIG(do_fork()) == SIGSEGV);
 
 	return 0;
 }
diff --git a/lib/tests/igt_simulation.c b/lib/tests/igt_simulation.c
index 32830ba7dde8..2efccac4e390 100644
--- a/lib/tests/igt_simulation.c
+++ b/lib/tests/igt_simulation.c
@@ -99,7 +99,7 @@ static int do_fork(void)
 
 		internal_assert(WIFEXITED(status));
 
-		return WEXITSTATUS(status);
+		return status;
 	}
 }
 
@@ -108,10 +108,10 @@ int main(int argc, char **argv)
 	/* simple tests */
 	simple = true;
 	internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
-	internal_assert(do_fork() == IGT_EXIT_SKIP);
+	internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SKIP);
 
 	internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
-	internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+	internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS);
 
 	/* subtests, list mode */
 	simple = false;
@@ -119,25 +119,29 @@ int main(int argc, char **argv)
 
 	in_fixture = false;
 	internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
-	internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+	internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS);
 
 	internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
-	internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+	internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS);
 
 	in_fixture = true;
 	internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
-	internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+	internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS);
+
 
 	internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
-	internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+	internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS);
+
 
 	in_fixture = false;
 	in_subtest = true;
 	internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
-	internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+	internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS);
+
 
 	internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
-	internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+	internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS);
+
 
 	/* subtest, run mode */
 	simple = false;
@@ -145,25 +149,30 @@ int main(int argc, char **argv)
 
 	in_fixture = false;
 	internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
-	internal_assert(do_fork() == IGT_EXIT_SKIP);
+	internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SKIP);
 
 	internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
-	internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+	internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS);
+
 
 	in_fixture = true;
 	internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
-	internal_assert(do_fork() == IGT_EXIT_SKIP);
+	internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SKIP);
+
 
 	internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
-	internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+	internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS);
+
 
 	in_fixture = false;
 	in_subtest = true;
 	internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
-	internal_assert(do_fork() == IGT_EXIT_SKIP);
+	internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SKIP);
+
 
 	internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
-	internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+	internal_assert(WEXITSTATUS(do_fork()) == IGT_EXIT_SUCCESS);
+
 
 	return 0;
 }
-- 
2.20.1

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

             reply	other threads:[~2019-02-13 10:35 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-13 10:35 Daniel Vetter [this message]
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 2/9] lib/tests: Check that igt_assert forwards correctly through igt_fork Daniel Vetter
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 3/9] lib/tests: make sure igt_skip in igt_fork is forbidden Daniel Vetter
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 4/9] lib: Don't leak children in igt_waitchildren_timeout Daniel Vetter
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 5/9] tests/gem_exec_reuse: Don't leak the hang detector Daniel Vetter
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 6/9] tests/i915_missed_irq: Don't leave the hang detector hanging Daniel Vetter
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 7/9] lib: Make sure we leak no child processes Daniel Vetter
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 8/9] lib: Drop igt_child_done Daniel Vetter
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 9/9] lib: Drop IGT_EXIT_TIMEOUT Daniel Vetter
2019-02-13 10:49 ` [igt-dev] [PATCH i-g-t 1/9] lib/tests: Drop NIH exit status handling Chris Wilson
2019-02-13 10:51   ` Chris Wilson
2019-02-13 13:13   ` Daniel Vetter
2019-02-14  9:53 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/9] lib/tests: Drop NIH exit status handling (rev2) Patchwork
2019-02-14 15:00 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/9] lib/tests: Drop NIH exit status handling (rev3) Patchwork
2019-02-14 20:13 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2019-02-15  9:37   ` Daniel Vetter
2019-02-15 17:53 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/9] lib/tests: Drop NIH exit status handling (rev4) 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=20190213103551.5438-1-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