From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id F0EDC6E0CA for ; Tue, 17 Dec 2019 09:48:09 +0000 (UTC) From: Petri Latvala Date: Tue, 17 Dec 2019 11:47:50 +0200 Message-Id: <20191217094800.30687-1-petri.latvala@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 01/11] runner/resultgen: Extract igt-version field handling to a helper 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: igt-dev@lists.freedesktop.org Cc: Petri Latvala List-ID: Signed-off-by: Petri Latvala Reviewed-by: Arkadiusz Hiler --- runner/resultgen.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/runner/resultgen.c b/runner/resultgen.c index aa438000..31bc0bb1 100644 --- a/runner/resultgen.c +++ b/runner/resultgen.c @@ -365,6 +365,17 @@ static void free_matches(struct matches *matches) free(matches->items); } +static void add_igt_version(struct json_object *testobj, + const char *igt_version, + size_t igt_version_len) +{ + if (igt_version) + json_object_object_add(testobj, "igt-version", + json_object_new_string_len(igt_version, + igt_version_len)); + +} + static bool fill_from_output(int fd, const char *binary, const char *key, struct subtest_list *subtests, struct json_object *tests) @@ -420,10 +431,7 @@ static bool fill_from_output(int fd, const char *binary, const char *key, json_object_object_add(current_test, key, json_object_new_string_len(buf, statbuf.st_size)); - if (igt_version) - json_object_object_add(current_test, "igt-version", - json_object_new_string_len(igt_version, - igt_version_len)); + add_igt_version(current_test, igt_version, igt_version_len); return true; } @@ -522,11 +530,7 @@ static bool fill_from_output(int fd, const char *binary, const char *key, json_object_object_add(current_test, key, json_object_new_string_len(beg, end - beg)); - if (igt_version) { - json_object_object_add(current_test, "igt-version", - json_object_new_string_len(igt_version, - igt_version_len)); - } + add_igt_version(current_test, igt_version, igt_version_len); if (!json_object_object_get_ex(current_test, "result", NULL)) { parse_subtest_result(subtests->subs[i].name, @@ -608,10 +612,7 @@ static bool fill_from_output(int fd, const char *binary, const char *key, json_object_object_add(current_dynamic_test, key, json_object_new_string_len(dynbeg, dynend - dynbeg)); - if (igt_version) - json_object_object_add(current_dynamic_test, "igt-version", - json_object_new_string_len(igt_version, - igt_version_len)); + add_igt_version(current_dynamic_test, igt_version, igt_version_len); if (!json_object_object_get_ex(current_dynamic_test, "result", NULL)) { const char *dynresulttext; -- 2.19.1 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev