885210d348
Before, kunit.py always printed "arch": "UM" in its json output, but...
1. With `kunit.py parse`, we could be parsing output from anywhere, so
we can't say that.
2. Capitalizing it is probably wrong, as it's `ARCH=um`
3. Commit 87c9c16317 ("kunit: tool: add support for QEMU") made it so
kunit.py could knowingly run a different arch, yet we'd still always
claim "UM".
This patch addresses all of those. E.g.
1.
$ ./tools/testing/kunit/kunit.py parse .kunit/test.log --json | grep -o '"arch.*' | sort -u
"arch": "",
2.
$ ./tools/testing/kunit/kunit.py run --json | ...
"arch": "um",
3.
$ ./tools/testing/kunit/kunit.py run --json --arch=x86_64 | ...
"arch": "x86_64",
Signed-off-by: Daniel Latypov <dlatypov@google.com>
Reviewed-by: David Gow <davidgow@google.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
67 lines
1.6 KiB
Python
67 lines
1.6 KiB
Python
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# Generates JSON from KUnit results according to
|
|
# KernelCI spec: https://github.com/kernelci/kernelci-doc/wiki/Test-API
|
|
#
|
|
# Copyright (C) 2020, Google LLC.
|
|
# Author: Heidi Fahim <heidifahim@google.com>
|
|
|
|
from dataclasses import dataclass
|
|
import json
|
|
import os
|
|
|
|
import kunit_parser
|
|
|
|
from kunit_parser import Test, TestStatus
|
|
from typing import Any, Dict
|
|
|
|
@dataclass
|
|
class Metadata:
|
|
"""Stores metadata about this run to include in get_json_result()."""
|
|
arch: str = ''
|
|
def_config: str = ''
|
|
build_dir: str = ''
|
|
|
|
JsonObj = Dict[str, Any]
|
|
|
|
_status_map: Dict[TestStatus, str] = {
|
|
TestStatus.SUCCESS: "PASS",
|
|
TestStatus.SKIPPED: "SKIP",
|
|
TestStatus.TEST_CRASHED: "ERROR",
|
|
}
|
|
|
|
def _get_group_json(test: Test, common_fields: JsonObj) -> JsonObj:
|
|
sub_groups = [] # List[JsonObj]
|
|
test_cases = [] # List[JsonObj]
|
|
|
|
for subtest in test.subtests:
|
|
if subtest.subtests:
|
|
sub_group = _get_group_json(subtest, common_fields)
|
|
sub_groups.append(sub_group)
|
|
continue
|
|
status = _status_map.get(subtest.status, "FAIL")
|
|
test_cases.append({"name": subtest.name, "status": status})
|
|
|
|
test_group = {
|
|
"name": test.name,
|
|
"sub_groups": sub_groups,
|
|
"test_cases": test_cases,
|
|
}
|
|
test_group.update(common_fields)
|
|
return test_group
|
|
|
|
def get_json_result(test: Test, metadata: Metadata) -> str:
|
|
common_fields = {
|
|
"arch": metadata.arch,
|
|
"defconfig": metadata.def_config,
|
|
"build_environment": metadata.build_dir,
|
|
"lab_name": None,
|
|
"kernel": None,
|
|
"job": None,
|
|
"git_branch": "kselftest",
|
|
}
|
|
|
|
test_group = _get_group_json(test, common_fields)
|
|
test_group["name"] = "KUnit Test Group"
|
|
return json.dumps(test_group, indent=4)
|