summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Latvala <petri.latvala@intel.com>2020-08-05 13:59:00 +0300
committerPetri Latvala <petri.latvala@intel.com>2020-08-06 11:41:03 +0300
commitdc048961c2f54a251b43b81ebf2a95d1bab490f2 (patch)
treed4103a320df909c3ac4ed56cff82814ba552671e
parent3da65baa4f5a392fe88ad47a7d4e87f6a19926f1 (diff)
runner: Only claim the test was killed if it was killed
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> Reviewed-by: Lukasz Fiedorowicz <lukasz.fiedorowicz@intel.com>
-rw-r--r--runner/executor.c4
1 files 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. "