From nobody Sat Feb 7 07:31:16 2026 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 3F94D2E6116 for ; Mon, 5 Jan 2026 16:41:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767631304; cv=none; b=Q7KRpLFVRR2LaVnhumWRAGLThbwNMA5ElOZKa1Gj+ChGDzpxyq1JC8cuQO4QdLxM/qgJobmlKkZpK0ykqRFLZGghcA2L902SrxwssymEV3N1qXreGkXy90zZKJJyB0yR4PA+9U8xfAhbnNcejkNhadwdPIcu/tyDHmAYxZ3s2FI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767631304; c=relaxed/simple; bh=aw7Tb8yi+Z6BHI19zTJMa/P1khL0FVXGCGyzEGNGFwI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=k3UBrnR4g360h1f8JJlvqS7XO4s/7htoVNxVGZka6hkYMuq6CsTiB5myHZ8wxD39kS8tbpltaglFzH33LozmHIhSNFM5s3JLJA+S02kd6/l+AsiQeuXN8a5Fc6A+0AgFCQUAmdrbl/daLwjorOhW6kBA/YjC/cYeDH69ZuGmdOU= 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=QHaaXl8F; arc=none smtp.client-ip=209.85.210.177 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="QHaaXl8F" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-7b6dd81e2d4so147640b3a.0 for ; Mon, 05 Jan 2026 08:41:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767631300; x=1768236100; 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=TrT3dLlHGpW5cFPltlRdV3kq8k0TZrruJR65wiYQAOA=; b=QHaaXl8F0GEeDjSmvD/bBCgvcebZ/An7gJgLCtBGeTjSD1AlK03Ux6xi17cC+tWqZB x3zmLTgziDX6hmLxhmKYYu2EZp9gBKwVm/3YRGJHiV+ILm5pa2Vy8YmCN/DcAO3ZXdAt m6ZhaHdKC8XcHaZUyvsBkBvDnxRMaqSeQ4r4+RxPowlHgSoSY+kfcFL8OjQtK9SslLv4 0RQbYut7uVl1Vt9N3H4Hh5TP9K4aqRfoyZs06+rijk6z83oIMu/Ie6Pb1Dth6vmXTRkX Wpx52ohiY4WqM7e7fK71vKSfR5wwcmPjFtTnDmNpZ0ogndjvJ6B2g8A+QV0irQ+js2oY 3QLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767631300; x=1768236100; 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=TrT3dLlHGpW5cFPltlRdV3kq8k0TZrruJR65wiYQAOA=; b=rrC6ncffN4wKEslKY8rezBw0Pg+t9c1AVOcQGDALNylVzlb/XW0SJ9kgXy2m/6cEFE 7S6QYqEkcNZXH/btU+Er2uuq4tHemDZGLQ2Kku03PVHpU1KJlZ/m75I9szbESpKkzLHB cRn5bq/S9gS+aqxwzTd7qQLooRFTVEwMxceSqZleZcFccRfX08v4aPghopklPBvzjs7t NjgFZY3eo8O0N3NIr55HcpgGI0mvcBniM0Mb2R0LSatbIx6PgISW9coR1UrzvCVqBryo ytReIMeFUJxGuQ+Uaj1GMdQiBFNpiRpCrgLDvBRG4nWevJw3lhcb9WxE1C0Lr6ojDjon h4mQ== X-Forwarded-Encrypted: i=1; AJvYcCWWlBpGUbqfhyRvkxBv1gdl2K6yK3vu3j93IGxQBHMCUnYdl11Tu/T889E5XYuzosKISeImjOSlEosHUvo=@vger.kernel.org X-Gm-Message-State: AOJu0YzhYTwEsejLZ3yGxr4esSf8fdPXKXiAQ3PkkKS5izn4sDImeRCP cTg/IIdqC+w7ji8GN7L+7CeyxKAnVLmNAmhfKlGERr55/SwCJ62qmR46 X-Gm-Gg: AY/fxX4rjfqwC4tjyV/Nnnty5LhVLc8zY9ZuobSs0FcJxoLrqAGih1GYd29rJfwqU8W HuueUfO5AMF4EhWl4RSwfpgqclKCpPfpsiDczCzVBbHJTB1lNYPqy/6bes1IWQf0lkmNqno1E3J PF/W/m46cLrB/o8xqbgwIHlxHnPhueVfC8Yr8W4Qm3pP3Msy6czpPxc5twiAR3mmEQTDLzY7I3z FAh3lMO1O4Obh9HuwOw4vW7k1YEXTiL1AdVApzVzov2q8JEMsv1sgcw2LIwsihVhuJhUPiA9ETj RHAnfbU9x8OPda1s3dBdHiDvw+C7PP2VnpZc8SfAWdjZrdD4TrYRPGkPRlPCcTZskTscRJ+G1Ql eeL8o72V1UXBkz3f+ZMf5rMe6oBEOg4X9RVsVAv09YZ5cesUfL/aoW6Z+qnHBG3RaYZMQOdsFRS sxhnvBMEMbL7gntQyZK+I= X-Google-Smtp-Source: AGHT+IHu7uxDkGljRvFuuVm/57Ojr+hrgf41QijJcDTLFzLaZinLHT9wIkGII38E5k8xO0qSgx2AXw== X-Received: by 2002:a05:6a21:6d9f:b0:366:584c:62fa with SMTP id adf61e73a8af0-376a7af606cmr53814542637.21.1767631299786; Mon, 05 Jan 2026 08:41:39 -0800 (PST) Received: from [172.16.80.107] ([210.228.119.9]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c4bfc97acbasm148016a12.2.2026.01.05.08.41.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jan 2026 08:41:39 -0800 (PST) From: Ryota Sakamoto Date: Tue, 06 Jan 2026 01:41:01 +0900 Subject: [PATCH v2] kunit: respect KBUILD_OUTPUT env variable by default Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260106-kunit-kbuild_output-v2-1-582281797343@gmail.com> X-B4-Tracking: v=1; b=H4sIAAAAAAAC/32NWwqDMBQFtyL3uylJRLH96j6KlGgSvaiJ5EWLZ O9NXUA/Z+DMOcArh8rDvTrAqYQerSnALxWMszCTIigLA6e8YZx3ZIkGA1mGiKt82Rj2GEgjORP dTYuW1lCWu1Ma32f12Ree0QfrPudJYj/7v5cYYUQzPdRUK9pS/Zg2get1tBv0Oecv4u67ZLYAA AA= X-Change-ID: 20251228-kunit-kbuild_output-5d21a89fa603 To: Brendan Higgins , David Gow , Rae Moar Cc: linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, Ryota Sakamoto X-Mailer: b4 0.14.2 Currently, kunit.py ignores the KBUILD_OUTPUT env variable and always defaults to .kunit in the working directory. This behavior is inconsistent with standard Kbuild behavior, where KBUILD_OUTPUT defines the build artifact location. This patch modifies kunit.py to respect KBUILD_OUTPUT if set. A .kunit subdirectory is created inside KBUILD_OUTPUT to avoid polluting the build directory. Reviewed-by: David Gow Signed-off-by: Ryota Sakamoto --- Changes in v2: - Add Reviewed-by tag and remove RFC - Link to v1: https://lore.kernel.org/r/20251228-kunit-kbuild_output-v1-1-f= 1fb30fe060f@gmail.com --- tools/testing/kunit/kunit.py | 7 ++++++- tools/testing/kunit/kunit_tool_test.py | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py index cd99c1956331dbbfb06cf4ddf130db3dcf2a7c31..e3d82a038f93df0e86952da9246= 1bc2e02f69ed1 100755 --- a/tools/testing/kunit/kunit.py +++ b/tools/testing/kunit/kunit.py @@ -323,11 +323,16 @@ def get_default_jobs() -> int: return ncpu raise RuntimeError("os.cpu_count() returned None") =20 +def get_default_build_dir() -> str: + if 'KBUILD_OUTPUT' in os.environ: + return os.path.join(os.environ['KBUILD_OUTPUT'], '.kunit') + return '.kunit' + def add_common_opts(parser: argparse.ArgumentParser) -> None: parser.add_argument('--build_dir', help=3D'As in the make command, it specifies the build ' 'directory.', - type=3Dstr, default=3D'.kunit', metavar=3D'DIR') + type=3Dstr, default=3Dget_default_build_dir(), metavar=3D'DIR') parser.add_argument('--make_options', help=3D'X=3DY make option, can be repeated.', action=3D'append', metavar=3D'X=3DY') diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/k= unit_tool_test.py index bbba921e0eacb18663abfcabb2bccf330d8666f5..a55b5085310d1bc54a549d3f36a= 83f7697fb8881 100755 --- a/tools/testing/kunit/kunit_tool_test.py +++ b/tools/testing/kunit/kunit_tool_test.py @@ -601,6 +601,7 @@ class KUnitMainTest(unittest.TestCase): all_passed_log =3D file.readlines() =20 self.print_mock =3D mock.patch('kunit_printer.Printer.print').start() + mock.patch.dict(os.environ, clear=3DTrue).start() self.addCleanup(mock.patch.stopall) =20 self.mock_linux_init =3D mock.patch.object(kunit_kernel, 'LinuxSourceTre= e').start() @@ -723,6 +724,24 @@ class KUnitMainTest(unittest.TestCase): args=3DNone, build_dir=3Dbuild_dir, filter_glob=3D'', filter=3D'', filt= er_action=3DNone, timeout=3D300) self.print_mock.assert_any_call(StrContains('Testing complete.')) =20 + @mock.patch.dict(os.environ, {'KBUILD_OUTPUT': '/tmp'}) + def test_run_builddir_from_env(self): + build_dir =3D '/tmp/.kunit' + kunit.main(['run']) + self.assertEqual(self.linux_source_mock.build_reconfig.call_count, 1) + self.linux_source_mock.run_kernel.assert_called_once_with( + args=3DNone, build_dir=3Dbuild_dir, filter_glob=3D'', filter=3D'', filt= er_action=3DNone, timeout=3D300) + self.print_mock.assert_any_call(StrContains('Testing complete.')) + + @mock.patch.dict(os.environ, {'KBUILD_OUTPUT': '/tmp'}) + def test_run_builddir_override(self): + build_dir =3D '.kunit' + kunit.main(['run', '--build_dir=3D.kunit']) + self.assertEqual(self.linux_source_mock.build_reconfig.call_count, 1) + self.linux_source_mock.run_kernel.assert_called_once_with( + args=3DNone, build_dir=3Dbuild_dir, filter_glob=3D'', filter=3D'', filt= er_action=3DNone, timeout=3D300) + self.print_mock.assert_any_call(StrContains('Testing complete.')) + def test_config_builddir(self): build_dir =3D '.kunit' kunit.main(['config', '--build_dir', build_dir]) --- base-commit: ccd1cdca5cd433c8a5dff78b69a79b31d9b77ee1 change-id: 20251228-kunit-kbuild_output-5d21a89fa603 Best regards, --=20 Ryota Sakamoto