diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-02-13 11:35:51 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-02-15 10:36:40 +0100 |
| commit | 0fb09e7f424fc6c82d52051e4640b65ad1c81eff (patch) | |
| tree | 14dbb13eaf946870fa2d2e6aca7c7d8a05de713c | |
| parent | d21a690f1a7c682ed51d167baa6404c129be17d4 (diff) | |
lib: Drop IGT_EXIT_TIMEOUT
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.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
| -rw-r--r-- | docs/reference/igt-gpu-tools/igt_test_programs.xml | 5 | ||||
| -rw-r--r-- | lib/igt_core.c | 8 | ||||
| -rw-r--r-- | lib/igt_core.h | 7 | ||||
| -rw-r--r-- | runner/resultgen.c | 3 |
4 files changed, 1 insertions, 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 2487da79..b64ba474 100644 --- a/docs/reference/igt-gpu-tools/igt_test_programs.xml +++ b/docs/reference/igt-gpu-tools/igt_test_programs.xml @@ -82,11 +82,6 @@ <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> <entry>An invalid option or subtest was specified</entry> diff --git a/lib/igt_core.c b/lib/igt_core.c index b59bb81e..71b05d3b 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 46bc935a..47ffd9e7 100644 --- a/lib/igt_core.h +++ b/lib/igt_core.h @@ -94,13 +94,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: * * Exit status indicating the test was skipped. diff --git a/runner/resultgen.c b/runner/resultgen.c index be884955..32b59d59 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: |