public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] runner: Only claim the test was killed if it was killed
@ 2020-08-05 10:59 Petri Latvala
  2020-08-05 12:13 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Petri Latvala @ 2020-08-05 10:59 UTC (permalink / raw)
  To: igt-dev; +Cc: Petri Latvala

If we don't have --abort=taint active and there is a kernel taint,
test exiting normally caused the runner to inject a "this test was
killed" message to the test's output. Make sure we only inject that if
we really did kill the test, and journal the test exit correctly as
well.

Same goes for the message for exceeding disk usage limits.

Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Arkadiusz Hiler <arek@hiler.eu>
Cc: Lukasz Fiedorowicz <lukasz.fiedorowicz@intel.com>
---
 runner/executor.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runner/executor.c b/runner/executor.c
index 0377195d..1688ae41 100644
--- a/runner/executor.c
+++ b/runner/executor.c
@@ -1071,7 +1071,7 @@ static int monitor_output(pid_t child,
 				 * the result an incomplete we avoid
 				 * journaling a timeout here.
 				 */
-				if (is_tainted(taints)) {
+				if (killed && is_tainted(taints)) {
 					exitline = EXECUTOR_EXIT;
 
 					/*
@@ -1096,7 +1096,7 @@ static int monitor_output(pid_t child,
 				 * Same goes for stopping because we
 				 * exceeded the disk usage limit.
 				 */
-				if (disk_usage_limit_exceeded(settings, disk_usage)) {
+				if (killed && disk_usage_limit_exceeded(settings, disk_usage)) {
 					exitline = EXECUTOR_EXIT;
 					dprintf(outputs[_F_OUT],
 						"\nrunner: This test was killed due to exceeding disk usage limit. "
-- 
2.20.1

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

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-08-06 16:37 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-05 10:59 [igt-dev] [PATCH i-g-t] runner: Only claim the test was killed if it was killed Petri Latvala
2020-08-05 12:13 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2020-08-05 14:01 ` [igt-dev] [PATCH i-g-t] " Lukasz Fiedorowicz
2020-08-05 16:26 ` [igt-dev] ✗ Fi.CI.IGT: failure for " Patchwork
2020-08-06  8:38   ` Petri Latvala
2020-08-06 16:37     ` Vudum, Lakshminarayana
2020-08-06 15:44 ` [igt-dev] ✓ Fi.CI.IGT: success " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox