diff options
| author | Petri Latvala <petri.latvala@intel.com> | 2019-12-17 11:47:50 +0200 |
|---|---|---|
| committer | Petri Latvala <petri.latvala@intel.com> | 2020-01-03 12:28:05 +0200 |
| commit | 08ef14aaeb8aed8e1d267609272a997c527c8835 (patch) | |
| tree | bcb68566db7300aa0619aed7581672bbac6b3e18 /runner | |
| parent | a555a4b98f90dab655d24bb3d07e9291a8b8dac8 (diff) | |
runner/resultgen: Extract igt-version field handling to a helper
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Diffstat (limited to 'runner')
| -rw-r--r-- | runner/resultgen.c | 27 |
1 files 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; |