[igt-dev] [PATCH i-g-t 7/7] lib: Drop IGT_EXIT_TIMEOUT

Daniel Vetter
2019-02-07T16:51:16Z

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 89f476ca1807..9f29666969c0 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";