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 9/9] lib: Drop IGT_EXIT_TIMEOUT
Date: Wed, 13 Feb 2019 11:35:51 +0100 [thread overview]
Message-ID: <20190213103551.5438-9-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20190213103551.5438-1-daniel.vetter@ffwll.ch>
We use the timeout status for when the runner had to kill a testcase,
which indicates a more sever issue than an operation failing that we
expected to complete within seconds.
Since it's unused, drop it.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
docs/reference/igt-gpu-tools/igt_test_programs.xml | 5 -----
lib/igt_core.c | 8 +-------
lib/igt_core.h | 7 -------
runner/resultgen.c | 3 ---
4 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/docs/reference/igt-gpu-tools/igt_test_programs.xml b/docs/reference/igt-gpu-tools/igt_test_programs.xml
index 2487da79588b..b64ba474a5f7 100644
--- a/docs/reference/igt-gpu-tools/igt_test_programs.xml
+++ b/docs/reference/igt-gpu-tools/igt_test_programs.xml
@@ -81,11 +81,6 @@
<entry>77</entry>
<entry>The test was skipped</entry>
</row>
- <row>
- <entry>#IGT_EXIT_TIMEOUT</entry>
- <entry>78</entry>
- <entry>The test took longer than expected and was stopped</entry>
- </row>
<row>
<entry>#IGT_EXIT_INVALID</entry>
<entry>79</entry>
diff --git a/lib/igt_core.c b/lib/igt_core.c
index b59bb81eef05..71b05d3bbd3b 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -1135,10 +1135,7 @@ void igt_fail(int exitcode)
_igt_log_buffer_dump();
if (in_subtest) {
- if (exitcode == IGT_EXIT_TIMEOUT)
- exit_subtest("TIMEOUT");
- else
- exit_subtest("FAIL");
+ exit_subtest("FAIL");
} else {
assert(igt_can_fail());
@@ -1541,9 +1538,6 @@ void igt_exit(void)
case IGT_EXIT_SUCCESS:
result = "SUCCESS";
break;
- case IGT_EXIT_TIMEOUT:
- result = "TIMEOUT";
- break;
case IGT_EXIT_SKIP:
result = "SKIP";
break;
diff --git a/lib/igt_core.h b/lib/igt_core.h
index 46bc935a428c..47ffd9e77308 100644
--- a/lib/igt_core.h
+++ b/lib/igt_core.h
@@ -93,13 +93,6 @@ extern char *igt_frame_dump_path;
*/
#define IGT_TEST_DESCRIPTION(str) const char* __igt_test_description = str
-/**
- * IGT_EXIT_TIMEOUT:
- *
- * Exit status indicating a timeout occurred.
- */
-#define IGT_EXIT_TIMEOUT 78
-
/**
* IGT_EXIT_SKIP:
*
diff --git a/runner/resultgen.c b/runner/resultgen.c
index be884955e86c..32b59d59aad2 100644
--- a/runner/resultgen.c
+++ b/runner/resultgen.c
@@ -18,7 +18,6 @@
#define INCOMPLETE_EXITCODE -1
-_Static_assert(INCOMPLETE_EXITCODE != IGT_EXIT_TIMEOUT, "exit code clash");
_Static_assert(INCOMPLETE_EXITCODE != IGT_EXIT_SKIP, "exit code clash");
_Static_assert(INCOMPLETE_EXITCODE != IGT_EXIT_SUCCESS, "exit code clash");
_Static_assert(INCOMPLETE_EXITCODE != IGT_EXIT_INVALID, "exit code clash");
@@ -731,8 +730,6 @@ static bool fill_from_dmesg(int fd,
static const char *result_from_exitcode(int exitcode)
{
switch (exitcode) {
- case IGT_EXIT_TIMEOUT:
- return "timeout";
case IGT_EXIT_SKIP:
return "skip";
case IGT_EXIT_SUCCESS:
--
2.20.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2019-02-13 10:36 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-13 10:35 [igt-dev] [PATCH i-g-t 1/9] lib/tests: Drop NIH exit status handling Daniel Vetter
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 ` Daniel Vetter [this message]
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
-- strict thread matches above, loose matches on Subject: below --
2019-02-11 18:02 [igt-dev] [PATCH i-g-t 1/9] lib/tests: Check that igt_assert forwards correctly through igt_fork Daniel Vetter
2019-02-11 18:02 ` [igt-dev] [PATCH i-g-t 9/9] lib: Drop IGT_EXIT_TIMEOUT Daniel Vetter
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-9-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