aa1c05558e
--build_dir is set to a default of '.kunit' since commit ddbd60c779b4
("kunit: use --build_dir=.kunit as default"), but even before then it
was explicitly set to ''.
So outside of one unit test, there was no way for the build_dir to be
ever be None, and we can simplify code by fixing the unit test and
enforcing that via updated type annotations.
E.g. this lets us drop `get_file_path()` since it's now exactly
equivalent to os.path.join().
Note: there's some `if build_dir` checks that also fail if build_dir is
explicitly set to '' that just guard against passing "O=" to make.
But running `make O=` works just fine, so drop these checks.
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>
56 lines
1.5 KiB
Python
56 lines
1.5 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>
|
|
|
|
import json
|
|
import os
|
|
|
|
import kunit_parser
|
|
|
|
from kunit_parser import Test, TestStatus
|
|
from typing import Any, Dict
|
|
|
|
JsonObj = Dict[str, Any]
|
|
|
|
def _get_group_json(test: Test, def_config: str, build_dir: str) -> JsonObj:
|
|
sub_groups = [] # List[JsonObj]
|
|
test_cases = [] # List[JsonObj]
|
|
|
|
for subtest in test.subtests:
|
|
if len(subtest.subtests):
|
|
sub_group = _get_group_json(subtest, def_config,
|
|
build_dir)
|
|
sub_groups.append(sub_group)
|
|
else:
|
|
test_case = {"name": subtest.name, "status": "FAIL"}
|
|
if subtest.status == TestStatus.SUCCESS:
|
|
test_case["status"] = "PASS"
|
|
elif subtest.status == TestStatus.SKIPPED:
|
|
test_case["status"] = "SKIP"
|
|
elif subtest.status == TestStatus.TEST_CRASHED:
|
|
test_case["status"] = "ERROR"
|
|
test_cases.append(test_case)
|
|
|
|
test_group = {
|
|
"name": test.name,
|
|
"arch": "UM",
|
|
"defconfig": def_config,
|
|
"build_environment": build_dir,
|
|
"sub_groups": sub_groups,
|
|
"test_cases": test_cases,
|
|
"lab_name": None,
|
|
"kernel": None,
|
|
"job": None,
|
|
"git_branch": "kselftest",
|
|
}
|
|
return test_group
|
|
|
|
def get_json_result(test: Test, def_config: str, build_dir: str) -> str:
|
|
test_group = _get_group_json(test, def_config, build_dir)
|
|
test_group["name"] = "KUnit Test Group"
|
|
return json.dumps(test_group, indent=4)
|