From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 657D788A36 for ; Wed, 5 Aug 2020 14:01:44 +0000 (UTC) From: Lukasz Fiedorowicz In-Reply-To: <20200805105900.29444-1-petri.latvala@intel.com> References: <20200805105900.29444-1-petri.latvala@intel.com> Date: Wed, 5 Aug 2020 16:01:40 +0200 Message-ID: <87tuxh2nuj.fsf@lfiedoro-desk1.igk.intel.com> MIME-Version: 1.0 Subject: Re: [igt-dev] [PATCH i-g-t] runner: Only claim the test was killed if it was killed List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: Petri Latvala , igt-dev@lists.freedesktop.org Cc: Petri Latvala List-ID: Petri Latvala writes: > 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 > Cc: Arkadiusz Hiler > Cc: Lukasz Fiedorowicz LGTM Reviewed-by: Lukasz Fiedorowicz > --- > 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 > -- Thanks, Lukasz _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev