aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/tools/testing/kunit/kunit_json.py
diff options
context:
space:
mode:
authorDaniel Latypov <dlatypov@google.com>2022-02-24 11:20:36 -0800
committerShuah Khan <skhan@linuxfoundation.org>2022-04-04 15:22:30 -0600
commit885210d348f71e14b91bdf626d5d9039bf1afb03 (patch)
tree34de601f47cf5cfd1bc8c5eab3ea461c733648f9 /tools/testing/kunit/kunit_json.py
parentkunit: tool: refactor how we plumb metadata into JSON (diff)
downloadwireguard-linux-885210d348f71e14b91bdf626d5d9039bf1afb03.tar.xz
wireguard-linux-885210d348f71e14b91bdf626d5d9039bf1afb03.zip
kunit: tool: properly report the used arch for --json, or '' if not known
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 87c9c1631788 ("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>
Diffstat (limited to 'tools/testing/kunit/kunit_json.py')
-rw-r--r--tools/testing/kunit/kunit_json.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/kunit/kunit_json.py b/tools/testing/kunit/kunit_json.py
index 0a7e29a315ed..1212423fe6bc 100644
--- a/tools/testing/kunit/kunit_json.py
+++ b/tools/testing/kunit/kunit_json.py
@@ -18,8 +18,8 @@ from typing import Any, Dict
@dataclass
class Metadata:
"""Stores metadata about this run to include in get_json_result()."""
- arch: str = 'UM'
- def_config: str = 'kunit_defconfig'
+ arch: str = ''
+ def_config: str = ''
build_dir: str = ''
JsonObj = Dict[str, Any]