diff options
Diffstat (limited to 'runner/resultgen.c')
| -rw-r--r-- | runner/resultgen.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/runner/resultgen.c b/runner/resultgen.c index b0933ad7..74e6d21f 100644 --- a/runner/resultgen.c +++ b/runner/resultgen.c @@ -466,8 +466,8 @@ static bool fill_from_output(int fd, const char *binary, const char *key, /* * This regexp controls the kmsg handling. All kernel log records that - * have log level of warning or higher convert the result to - * dmesg-warn/dmesg-fail unless they match this regexp. + * have log level of warning or higher convert a passing result to + * warn unless they match this regexp. * * TODO: Move this to external files, i915-suppressions.txt, * general-suppressions.txt et al. @@ -826,14 +826,11 @@ static void override_result_single(struct json_object *obj) { const char *errtext = NULL, *result = NULL; struct json_object *textobj; - bool dmesgwarns = false; if (json_object_object_get_ex(obj, "err", &textobj)) errtext = json_object_get_string(textobj); if (json_object_object_get_ex(obj, "result", &textobj)) result = json_object_get_string(textobj); - if (json_object_object_get_ex(obj, "dmesg-warnings", &textobj)) - dmesgwarns = true; if (!strcmp(result, "pass") && count_lines(errtext, errtext + strlen(errtext)) > 2) { @@ -841,13 +838,9 @@ static void override_result_single(struct json_object *obj) result = "warn"; } - if (dmesgwarns) { - if (!strcmp(result, "pass") || !strcmp(result, "warn")) { - set_result(obj, "dmesg-warn"); - } else if (!strcmp(result, "fail")) { - set_result(obj, "dmesg-fail"); - } - } + if (json_object_object_get_ex(obj, "dmesg-warnings", &textobj) && + !strcmp(result, "pass")) + set_result(obj, "warn"); } static void override_results(char *binary, |