From nobody Mon Feb 9 17:21:31 2026 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CD1412D1EC for ; Thu, 22 Feb 2024 22:18:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708640306; cv=none; b=AmN5oMqfQzO3gIgxn7oimh+YDYX5NxJDBJxWCDgDcnfWkFGer2c5M3RjCIHWNaJLdaRwkL6oX8Ed+YscFJbh+lRSZdsSADWC6bPpQThkOZQyjrqspyp0j52jkaPzLmUnSnSxHqPdyVe+9yDLlficpFKd/Jsgjm0tZqg7Z+Yq4qs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708640306; c=relaxed/simple; bh=GySJPqsa46qjefpa40BPSAtIQnwOgTHwplk+ekXDzDE=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=Gxk5+LIhK4yDMmv11jDU0oskLlcHC1OUZWAKUB6qNlGtuBwXVFS2rQYd3xbopCKpuYvD0cNctHQXSvrNXuPRnxPGpXBGkqDSlt7mVIkSfgpBdqNxqxXGlQQwDsCwsOlYzzAHDSM6pQZgXINaeI6Cuj0Rs7MnQR6SJDTyD7W4BVY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--rmoar.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=rJsWt/14; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--rmoar.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rJsWt/14" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-608852fc324so4285427b3.2 for ; Thu, 22 Feb 2024 14:18:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708640304; x=1709245104; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=jUpDAbHl4PhD0AQm18/km5kyUpNrcIzm2UavY3bA4II=; b=rJsWt/14Ooh9gkTpYqJaWE+BHDdlSxNCjv+72F2ypfWwGHeImntlVsbnrmD/lHZ0cl e9NhdKM8n1uGZ7Dxj3YYL0eFmoiDwkValG/EgjcboX9Ig+5PCLJYnNyCdnfGga/ZgAQs IPoOSKOygR4iEqcyRJn8RXlYMX6UVNV/KcB1TxFsZHNi2wJzxi1TTkTrGI19qKfv0aHM lXjfEY6HRyo8DZeQh5RyvyyXjBrfmExJetxAEdvqdN0hBmXCXqmvaR+92IB8m8LMsqFa FRc+BKaH0TnWphuHLUo9oYPUePfNt2DyFi7A5UyPQef2byfX9ohR6Zq7QBkgnWEMsGSU YcjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708640304; x=1709245104; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=jUpDAbHl4PhD0AQm18/km5kyUpNrcIzm2UavY3bA4II=; b=SPDhGLdGXpyD8gGI5OJh4HYnO/dkvwjSu8Snv4Pn4sxqT7wjZYjJ3ciCPjGLYNTBGW Ab5/xALiDIxgZfqyEus/Z9jw7ykZbeVBvvqn2AKTq7wCh0fHxjCSYxRVMBR8WShWoMgq ZE0VJcUQ3MWG95DI5I5WsHeNFe0H0QH0BRF5Qvo22Q4w+f/qskUV1YNroUSw6aM0B1ZL 9FtHpis1xScB04p0j6k578Cdl8EITDxOrNCeCzOHyPd//+sjhIKmAROq3vvav8nzsiiC Akg6p3TEyIpa3pfraD2KzNuLOEPCpXIILGyAE12VQb5fjalYiBlkduDshanl6qQ/VtnC ndVA== X-Forwarded-Encrypted: i=1; AJvYcCVXacJJCZQJttV7Xtsc7IE3aJik9yYmqaOyyo6FpZTNuOWD+yHUyK2ZwBRfmpn1Jm+MXdYREXNscKyITwqTnI6ijYmQfHSELVwDWVeb X-Gm-Message-State: AOJu0YxGHTuasr38IgeMT6uXnhWcrcrKh6xZwnvIKChcA7flFyhlggFV hEep7r+aI0Jo+XNiIDRSLVYCEzj5WgzUVjbV5zHcDES/Vf2jpG/T4MOjBkWqa4sX2Me5HcqlPQ= = X-Google-Smtp-Source: AGHT+IFExReO3c4IzKQGndU5Mktj19q0+l1b3yNa4AC256uF/PSrXSms4ghCI5J9w09x/QJbDNAG34ZKqQ== X-Received: from rmoar-specialist.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:45d3]) (user=rmoar job=sendgmr) by 2002:a05:690c:fcb:b0:608:406d:6973 with SMTP id dg11-20020a05690c0fcb00b00608406d6973mr118080ywb.5.1708640303929; Thu, 22 Feb 2024 14:18:23 -0800 (PST) Date: Thu, 22 Feb 2024 22:18:14 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240222221814.3572215-1-rmoar@google.com> Subject: [PATCH] kunit: tool: add parsing of all files in directory From: Rae Moar To: shuah@kernel.org, davidgow@google.com, dlatypov@google.com, brendan.higgins@linux.dev, kevko@google.com Cc: linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, Rae Moar Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add ability to parse all files within a directory. Additionally add the ability to parse all results in the KUnit debugfs repository. How to parse all files in directory: ./tools/testing/kunit/kunit.py parse [directory path] How to parse KUnit debugfs repository: ./tools/testing/kunit/kunit.py parse debugfs For each file, the parser outputs the file name, results, and test summary. At the end of all parsing, the parser outputs a total summary line. This feature can be easily tested on the tools/testing/kunit/test_data/ directory. Signed-off-by: Rae Moar --- tools/testing/kunit/kunit.py | 45 ++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py index bc74088c458a..827e6dac40ae 100755 --- a/tools/testing/kunit/kunit.py +++ b/tools/testing/kunit/kunit.py @@ -511,19 +511,40 @@ def exec_handler(cli_args: argparse.Namespace) -> Non= e: =20 =20 def parse_handler(cli_args: argparse.Namespace) -> None: - if cli_args.file is None: + parsed_files =3D [] + total_test =3D kunit_parser.Test() + total_test.status =3D kunit_parser.TestStatus.SUCCESS + if cli_args.file_path is None: sys.stdin.reconfigure(errors=3D'backslashreplace') # type: ignore kunit_output =3D sys.stdin # type: Iterable[str] - else: - with open(cli_args.file, 'r', errors=3D'backslashreplace') as f: + elif cli_args.file_path =3D=3D "debugfs": + for (root, _, files) in os.walk("/sys/kernel/debug/kunit"): + for file in files: + if file =3D=3D "results": + parsed_files.append(os.path.join(root, file)) + elif os.path.isdir(cli_args.file_path): + for (root, _, files) in os.walk(cli_args.file_path): + for file in files: + parsed_files.append(os.path.join(root, file)) + elif os.path.isfile(cli_args.file_path): + parsed_files.append(cli_args.file_path) + + for file in parsed_files: + print(file) + with open(file, 'r', errors=3D'backslashreplace') as f: kunit_output =3D f.read().splitlines() - # We know nothing about how the result was created! - metadata =3D kunit_json.Metadata() - request =3D KunitParseRequest(raw_output=3Dcli_args.raw_output, - json=3Dcli_args.json) - result, _ =3D parse_tests(request, metadata, kunit_output) - if result.status !=3D KunitStatus.SUCCESS: - sys.exit(1) + # We know nothing about how the result was created! + metadata =3D kunit_json.Metadata() + request =3D KunitParseRequest(raw_output=3Dcli_args.raw_output, + json=3Dcli_args.json) + _, test =3D parse_tests(request, metadata, kunit_output) + total_test.subtests.append(test) + + if len(parsed_files) > 1: # if more than one file was parsed output total= summary + print('All files parsed.') + stdout.print_with_timestamp(kunit_parser.DIVIDER) + kunit_parser.bubble_up_test_results(total_test) + kunit_parser.print_summary_line(total_test) =20 =20 subcommand_handlers_map =3D { @@ -569,8 +590,8 @@ def main(argv: Sequence[str]) -> None: help=3D'Parses KUnit results from a file, ' 'and parses formatted results.') add_parse_opts(parse_parser) - parse_parser.add_argument('file', - help=3D'Specifies the file to read results from.', + parse_parser.add_argument('file_path', + help=3D'Specifies the file path to read results from.', type=3Dstr, nargs=3D'?', metavar=3D'input_file') =20 cli_args =3D parser.parse_args(massage_argv(argv)) base-commit: 08c454e26daab6f843e5883fb96f680f11784fa6 --=20 2.44.0.rc0.258.g7320e95886-goog