From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 1587B395D8F for ; Thu, 15 Jan 2026 14:54:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768488851; cv=none; b=CxLmnGomAMJOppq6Gz0R/LgNgIHhKSX5lGqOLjfdviYBd4+TtOyJGgJjZX/8A3+Gy+H/B33rVHIPQTDQK5wouu0eqQXnbDNlUzonLjp3OoUEy9QMoqGxUyAh57/QwaZzIAS6DzOwWFUTI6izMMWQ08lloOhrIYoWJROg5xRmgOU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768488851; c=relaxed/simple; bh=kGn5ufCD2jXTTdxEirwcUNO4FHgwrNNxGOcBr7XwKF0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=UeljOqp6vGUQED0iCMNWFYgLsyZLOluEQmcqljTZzxNOHvD6cDt21QhHg0UL71I3SUWYVCZbY3wOKEATpP3IeiYZ/aloWJc6WXxi5mCQ6HUjJ4DMH69tozRTsZsokCPaRFJT0bjaiKjsjpJ27QEITP3wUmi+CLssyIhhVLOGhLY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ZB2SXpok; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZB2SXpok" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2a0bb2f093aso5719045ad.3 for ; Thu, 15 Jan 2026 06:54:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768488849; x=1769093649; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=s5/4FHNHwz9CtyRKUeDLugwuQOX195LiHNnu/QshYQE=; b=ZB2SXpokVWCd0WkkZrX7LUuIKpaqa4WP/Gao3y2TAMXf5m9nDgEi3u9FT75cwT5g7i f+JS7RQp4T3dpwKt+y9BjgKdxUuwRjlLZvEDnkflz0Id09YiAv4DnB3EDB8VTQyo972w f8TbvsgWvjn+ubrfZR3sMsoLl1qWHqcZ4pUND4vMCPchmIWzMTEM1L0Z/6DxDDxmENcu gf//tmZ9BF0yeh8Uc/LiSRWhBXfa74ancz0FD4LI3CBnArSSo94QKTMjT7Ne4h9onL9f NV1gHdCN915J2tBS+0lqBX/z2ICihME0oK+I0CNIBjxjTTCqdsppsWC5rpfwld52rrMV QFxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768488849; x=1769093649; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=s5/4FHNHwz9CtyRKUeDLugwuQOX195LiHNnu/QshYQE=; b=HF3nJEA/2etcUY1Q/TM5+vSr/Dbm2hzpvDlrFrzZ5YdU6VNp5r+rWlQPR7iJA6Jjes xWIxYZyfiexpVjPrt1QNl+rf8dUkPVCENbOUw0Kvr0wUkHSC4qZ9SDA7Fiaj1eo9m7G6 1xwPddeobOPyHHtRCgAKhrsOmdAZqmRif76ZuFmSFDjpeBL26nJqwrWToAZRoaRl3Auk g5tOub5WWTv69wf4l+748QWhQRY9XG48WJp1UfgiJIUwjzUjqh+QnPc37ZYHzkvpD6sM 2z26NoqWEwk2+B+HOl3UTfBMsoiQyQY2Nz4csHd98jb8OHl2eseAnIhiJ99H0gevxogQ i+AA== X-Forwarded-Encrypted: i=1; AJvYcCVjkNTolgE/MWGcJdJ+R8+IdlPJSKWf1c72W7yP+mbFRdOUx6LmtHOqY7aJjBSLmBxbkeRzZte52aw=@vger.kernel.org X-Gm-Message-State: AOJu0YyQH36GIbCWBNWW33XjqtVM0TC/AMoInMcexdY7+yMnM4bDIvPD NZcBTZo2P0nwYyIndGSNJNrw9uoVTlwYhyB8oLzInxtdOQoDp1xzDmYKIufhzvNt X-Gm-Gg: AY/fxX7fmuFhW6cc7XZCBrMbxqoN9cQVwW5H+dXswLoNMByaOnNGYmMRSunGV3HBGh1 qavpO0NJSERY3hjTfaVhqfpdpJHs2/ONGSNNkdHDnFcBw0TWo3FIn29Hn/kRTkaUoTDvlCl0Hl8 IifWg7a+ZsHAlCV7bRP3++UxE0dyzvH8B6R6Stoc5p51M6JsRuMu03CIBF5D7ijliYUzA/NFTMn BN1aWWShx//yFXOFT1p8Kdt49UIRBi04LHlVmsub6r3kaUTICPZcIprlohtdsGVJaefGAdxMB6N Ld4HuC6XrAoh3Alh6TbAF2HyTf4WMRPB77sZR0bWBjtMLnOj1zyqyM8SJLIe9jiniAFR7CjdHLA 3BagK+PUhXfuPRaviUf8MB9qof0ISsBk2IjtwMuanXjOv9wyw8o7XynrEqllwie4t+YZab8iVCu /tyzT3v/IzOybUCLkAKRE= X-Received: by 2002:a17:902:c408:b0:2a0:afeb:fbbb with SMTP id d9443c01a7336-2a599ded4b5mr63604885ad.1.1768488848976; Thu, 15 Jan 2026 06:54:08 -0800 (PST) Received: from [172.16.80.107] ([210.228.119.9]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3cb2ea0sm261120955ad.62.2026.01.15.06.54.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 06:54:08 -0800 (PST) From: Ryota Sakamoto Date: Thu, 15 Jan 2026 23:53:56 +0900 Subject: [PATCH] kunit: add bash completion Precedence: bulk X-Mailing-List: workflows@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260115-kunit-completion-v1-1-4de6564962c4@gmail.com> X-B4-Tracking: v=1; b=H4sIAAAAAAAC/x2MQQqAIBAAvxJ7TlBJ0b4SHcK2WioLtQjCvycdB 2bmhYiBMEJbvRDwpkiHLyDqCtwy+BkZjYVBcqm5EA1bL0+JuWM/N0xFZlIrY+ykrFMSSnYGnOj 5l12f8wdrRnFKYgAAAA== X-Change-ID: 20260114-kunit-completion-265889f59c52 To: Brendan Higgins , David Gow , Rae Moar , Jonathan Corbet Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, workflows@vger.kernel.org, linux-doc@vger.kernel.org, Ryota Sakamoto X-Mailer: b4 0.14.2 Currently, kunit.py has many subcommands and options, making it difficult to remember them without checking the help message. Add --list-cmds and --list-opts to kunit.py to get available commands and options, use those outputs in kunit-completion.sh to show completion. This implementation is similar to perf and tools/perf/perf-completion.sh. Example output: $ source tools/testing/kunit/kunit-completion.sh $ ./tools/testing/kunit/kunit.py [TAB][TAB] build config exec parse run $ ./tools/testing/kunit/kunit.py run --k[TAB][TAB] --kconfig_add --kernel_args --kunitconfig Signed-off-by: Ryota Sakamoto --- Documentation/dev-tools/kunit/run_wrapper.rst | 9 ++++++++ tools/testing/kunit/kunit-completion.sh | 33 +++++++++++++++++++++++++++ tools/testing/kunit/kunit.py | 30 ++++++++++++++++++++++++ tools/testing/kunit/kunit_tool_test.py | 21 +++++++++++++++++ 4 files changed, 93 insertions(+) diff --git a/Documentation/dev-tools/kunit/run_wrapper.rst b/Documentation/dev-tools/kunit/run_wrapper.rst index 6697c71ee8ca020b8ac7e91b46e29ab082d9dea0..3c0b585dcfffbd3929d0eef1ab9376fa4f380872 100644 --- a/Documentation/dev-tools/kunit/run_wrapper.rst +++ b/Documentation/dev-tools/kunit/run_wrapper.rst @@ -335,3 +335,12 @@ command line arguments: - ``--list_tests_attr``: If set, lists all tests that will be run and all of their attributes. + +Command-line completion +============================== + +The kunit_tool comes with a bash completion script: + +.. code-block:: bash + + source tools/testing/kunit/kunit-completion.sh diff --git a/tools/testing/kunit/kunit-completion.sh b/tools/testing/kunit/kunit-completion.sh new file mode 100644 index 0000000000000000000000000000000000000000..3b9b68e3bc384c026f10f74b8a1df2129cb2cd50 --- /dev/null +++ b/tools/testing/kunit/kunit-completion.sh @@ -0,0 +1,33 @@ +# SPDX-License-Identifier: GPL-2.0 +# bash completion support for KUnit + +_kunit_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) + +_kunit() +{ + local cur prev words cword + _init_completion || return + + local script="${_kunit_dir}/kunit.py" + + if [[ $cword -eq 1 && "$cur" != -* ]]; then + local cmds=$(${script} --list-cmds 2>/dev/null) + COMPREPLY=($(compgen -W "${cmds}" -- "$cur")) + return 0 + fi + + if [[ "$cur" == -* ]]; then + if [[ -n "${words[1]}" && "${words[1]}" != -* ]]; then + local opts=$(${script} ${words[1]} --list-opts 2>/dev/null) + COMPREPLY=($(compgen -W "${opts}" -- "$cur")) + return 0 + else + local opts=$(${script} --list-opts 2>/dev/null) + COMPREPLY=($(compgen -W "${opts}" -- "$cur")) + return 0 + fi + fi +} + +complete -o default -F _kunit kunit.py +complete -o default -F _kunit kunit diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py index cd99c1956331dbbfb06cf4ddf130db3dcf2a7c31..a5aee1eb88e65fa2387b2623642d2ee9a66db600 100755 --- a/tools/testing/kunit/kunit.py +++ b/tools/testing/kunit/kunit.py @@ -323,6 +323,17 @@ def get_default_jobs() -> int: return ncpu raise RuntimeError("os.cpu_count() returned None") +def add_completion_opts(parser: argparse.ArgumentParser) -> None: + parser.add_argument('--list-opts', + help=argparse.SUPPRESS, + action='store_true') + +def add_root_opts(parser: argparse.ArgumentParser) -> None: + parser.add_argument('--list-cmds', + help=argparse.SUPPRESS, + action='store_true') + add_completion_opts(parser) + def add_common_opts(parser: argparse.ArgumentParser) -> None: parser.add_argument('--build_dir', help='As in the make command, it specifies the build ' @@ -374,6 +385,8 @@ def add_common_opts(parser: argparse.ArgumentParser) -> None: help='Additional QEMU arguments, e.g. "-smp 8"', action='append', metavar='') + add_completion_opts(parser) + def add_build_opts(parser: argparse.ArgumentParser) -> None: parser.add_argument('--jobs', help='As in the make command, "Specifies the number of ' @@ -569,6 +582,7 @@ subcommand_handlers_map = { def main(argv: Sequence[str]) -> None: parser = argparse.ArgumentParser( description='Helps writing and running KUnit tests.') + add_root_opts(parser) subparser = parser.add_subparsers(dest='subcommand') # The 'run' command will config, build, exec, and parse in one go. @@ -603,12 +617,28 @@ def main(argv: Sequence[str]) -> None: parse_parser.add_argument('file', help='Specifies the file to read results from.', type=str, nargs='?', metavar='input_file') + add_completion_opts(parse_parser) cli_args = parser.parse_args(massage_argv(argv)) if get_kernel_root_path(): os.chdir(get_kernel_root_path()) + if cli_args.list_cmds: + print(" ".join(subparser.choices.keys())) + return + + if cli_args.list_opts: + target_parser = subparser.choices.get(cli_args.subcommand) + if not target_parser: + target_parser = parser + + # Accessing private attribute _option_string_actions to get + # the list of options. This is not a public API, but argparse + # does not provide a way to inspect options programmatically. + print(' '.join(target_parser._option_string_actions.keys())) + return + subcomand_handler = subcommand_handlers_map.get(cli_args.subcommand, None) if subcomand_handler is None: diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/kunit_tool_test.py index bbba921e0eacb18663abfcabb2bccf330d8666f5..a7f09a6c97a473ff85e087d17c2f5faf7755b994 100755 --- a/tools/testing/kunit/kunit_tool_test.py +++ b/tools/testing/kunit/kunit_tool_test.py @@ -11,11 +11,13 @@ from unittest import mock import tempfile, shutil # Handling test_tmpdir +import io import itertools import json import os import signal import subprocess +import sys from typing import Iterable import kunit_config @@ -855,5 +857,24 @@ class KUnitMainTest(unittest.TestCase): mock.call(args=None, build_dir='.kunit', filter_glob='suite2.test1', filter='', filter_action=None, timeout=300), ]) + @mock.patch.object(sys, 'stdout', new_callable=io.StringIO) + def test_list_cmds(self, mock_stdout): + kunit.main(['--list-cmds']) + output = mock_stdout.getvalue() + output_cmds = sorted(output.split()) + expected_cmds = sorted(['build', 'config', 'exec', 'parse', 'run']) + self.assertEqual(output_cmds, expected_cmds) + + @mock.patch.object(sys, 'stdout', new_callable=io.StringIO) + def test_run_list_opts(self, mock_stdout): + kunit.main(['run', '--list-opts']) + output = mock_stdout.getvalue() + output_cmds = set(output.split()) + self.assertIn('--help', output_cmds) + self.assertIn('--kunitconfig', output_cmds) + self.assertIn('--jobs', output_cmds) + self.assertIn('--kernel_args', output_cmds) + self.assertIn('--raw_output', output_cmds) + if __name__ == '__main__': unittest.main() --- base-commit: b71e635feefc852405b14620a7fc58c4c80c0f73 change-id: 20260114-kunit-completion-265889f59c52 Best regards, -- Ryota Sakamoto