summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Latvala <petri.latvala@intel.com>2018-04-17 16:34:26 +0300
committerPetri Latvala <petri.latvala@intel.com>2018-04-17 17:18:09 +0300
commit176c31a481ad4b281f131eee08d43bf6c5d52f72 (patch)
tree66f12291a61f7af36e988a9c72da531b91837c94
parentddbe5a4d8bb1780ecf07f72e815062d3bce8ff71 (diff)
lib: Make igt_set_timeout fail with a timeout statusHEADmaster
A timeout failure seems exactly what IGT_EXIT_TIMEOUT is for. Also make the failure error message be printed with critical log level to match what's done for __igt_fail_assert's message. Signed-off-by: Petri Latvala <petri.latvala@intel.com>
-rw-r--r--lib/igt_core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/igt_core.c b/lib/igt_core.c
index 5092a3f0..af36fef9 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -2143,12 +2143,12 @@ static const char *timeout_op;
static void __attribute__((noreturn)) igt_alarm_handler(int signal)
{
if (timeout_op)
- igt_info("Timed out: %s\n", timeout_op);
+ igt_critical("Timed out: %s\n", timeout_op);
else
- igt_info("Timed out\n");
+ igt_critical("Timed out\n");
/* exit with failure status */
- igt_fail(IGT_EXIT_FAILURE);
+ igt_fail(IGT_EXIT_TIMEOUT);
}
/**
@@ -2156,7 +2156,7 @@ static void __attribute__((noreturn)) igt_alarm_handler(int signal)
* @seconds: number of seconds before timeout
* @op: Optional string to explain what operation has timed out in the debug log
*
- * Fail a test and exit with #IGT_EXIT_FAILURE status after the specified
+ * Fail a test and exit with #IGT_EXIT_TIMEOUT status after the specified
* number of seconds have elapsed. If the current test has subtests and the
* timeout occurs outside a subtest, subsequent subtests will be skipped and
* marked as failed.