<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> </head> <body dir="ltr"> <div>I've tested it manually, it works. Tested-by: Piotr Kira <piotr.kira@intel.com> </div> <div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> </div> <div id="appendonsend"></div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr">From: Kamil Konieczny <kamil.konieczny@linux.intel.com> Sent: Thursday, November 30, 2023 4:09 PM To: igt-dev@lists.freedesktop.org <igt-dev@lists.freedesktop.org> Cc: Kira, Piotr <piotr.kira@intel.com>; Petri Latvala <adrinael@adrinael.net>; Kamil Konieczny <kamil.konieczny@linux.intel.com> Subject: [PATCH i-g-t] runner/resultgen: Fix subtest runtimes <div> </div> </div> <div class="BodyFragment"> <div class="PlainText">From: Piotr Kira <piotr.kira@intel.com> Runtimes for single subtest are not included in results json object after switching to socket communication. Make times for both subtests and dynamic subtests when using comms. v2: added GitLab issue number, added Petri to Cc (Kamil) reformat so it could be applied (Kamil) Cc: Petri Latvala <adrinael@adrinael.net> Fixes: 9d889fa6b8f0 ("runner: Use socket communications") Closes: <a href="https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/132">https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/132</a> Signed-off-by: Piotr Kira <piotr.kira@intel.com> Signed-off-by: Kamil Konieczny <kamil.konieczny@linux.intel.com> --- runner/resultgen.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/runner/resultgen.c b/runner/resultgen.c index b00bb6ba5..63f5b26d7 100644 --- a/runner/resultgen.c +++ b/runner/resultgen.c @@ -1262,6 +1262,9 @@ struct comms_context char *subtestresult; char *dynamicsubtestresult; + double subtest_execution_time; + double dynamic_subtest_execution_time; + char *cmdline; int exitcode; @@ -1321,6 +1324,7 @@ static void comms_finish_subtest(struct comms_context *context) if (context->subtestresult == NULL) context->subtestresult = strdup("incomplete"); set_result(context->current_test, context->subtestresult); + add_runtime(context->current_test, context->subtest_execution_time); free(context->subtestresult); context->subtestresult = NULL; @@ -1343,6 +1347,7 @@ static void comms_finish_dynamic_subtest(struct comms_context *context) if (context->dynamicsubtestresult == NULL) context->dynamicsubtestresult = strdup("incomplete"); set_result(context->current_dynamic_subtest, context->dynamicsubtestresult); + add_runtime(context->current_dynamic_subtest, context->dynamic_subtest_execution_time); free(context->dynamicsubtestresult); context->dynamicsubtestresult = NULL; @@ -1617,6 +1622,7 @@ static bool comms_handle_subtest_result(const struct runnerpacket *packet, strlen(helper.subtestresult.result), &mappedresult, NULL); context->subtestresult = strdup(mappedresult); + context->subtest_execution_time = strtod(helper.subtestresult.timeused, NULL); } context->state = STATE_BETWEEN_SUBTESTS; @@ -1757,6 +1763,7 @@ static bool comms_handle_dynamic_subtest_result(const struct runnerpacket *packe strlen(helper.dynamicsubtestresult.result), &mappedresult, NULL); context->dynamicsubtestresult = strdup(mappedresult); + context->dynamic_subtest_execution_time = strtod(helper.dynamicsubtestresult.timeused, NULL); } context->state = STATE_BETWEEN_DYNAMIC_SUBTESTS; -- 2.42.0 </div> </div> <hr/> Intel Technology Poland sp. z o.o. ul. Słowackiego 173 | 80-298 Gdańsk | Sąd Rejonowy Gdańsk Północ | VII Wydział Gospodarczy Krajowego Rejestru Sądowego - KRS 101882 | NIP 957-07-52-316 | Kapitał zakładowy 200.000 PLN. Spółka oświadcza, że posiada status dużego przedsiębiorcy w rozumieniu ustawy z dnia 8 marca 2013 r. o przeciwdziałaniu nadmiernym opóźnieniom w transakcjach handlowych. <span style="font-size:8.0pt; font-family:'Arial Narrow',sans-serif; mso-fareast-font-family: 'Times New Roman';mso-bidi-font-family:Arial; color:#595959; mso-ansi-language:EN-US; mso-fareast-language:EN-US; mso-bidi-language: PL-PL"> Ta wiadomość wraz z załącznikami jest przeznaczona dla określonego adresata i może zawierać informacje poufne. W razie przypadkowego otrzymania tej wiadomości, prosimy o powiadomienie nadawcy oraz trwałe jej usunięcie; jakiekolwiek przeglądanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited. <o:p></o:p> </body> </html>