From patchwork Mon Dec 22 23:18:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1058 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1766445544; bh=zc3Yj043QQ4jBIg7eIAoYthD1JQ1KYzlp9pNbV86lXI=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=EctthDdTyoVXPLUaHevdzGqcF4vLRhbyYieV/HoCN7YRARnMau26bZ9OGhwNjN66q ggilhHOMsfBWFhNTbbMtFft6wYLMLQVk3SwkgE9Y/U88xOWnU5GDs6HSxOHKchrMxX 7rOKRW65NLvc2LQqBgm1E0bwsSDfI2z2HPT5VW5tj96SezSlXA6kaitc98raWoP4Vd xa/5B3Dl/blTeu0+RSBgIA/90sTrj85yHjFiOUgCkuojYfLog4lWTDTRK/mVxoeaAz zoQ7tQDA96fep4qEMXK2ORSXl9BMKWS0ZSZM5zSc6DXzb1cj9hwdxdz2K0uRJb1aK5 E2KTZcOPhs8dw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id A504264D9A for ; Mon, 22 Dec 2025 16:19:04 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id l9M0F87CAwGP for ; Mon, 22 Dec 2025 16:19:04 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1766445544; bh=zc3Yj043QQ4jBIg7eIAoYthD1JQ1KYzlp9pNbV86lXI=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=EctthDdTyoVXPLUaHevdzGqcF4vLRhbyYieV/HoCN7YRARnMau26bZ9OGhwNjN66q ggilhHOMsfBWFhNTbbMtFft6wYLMLQVk3SwkgE9Y/U88xOWnU5GDs6HSxOHKchrMxX 7rOKRW65NLvc2LQqBgm1E0bwsSDfI2z2HPT5VW5tj96SezSlXA6kaitc98raWoP4Vd xa/5B3Dl/blTeu0+RSBgIA/90sTrj85yHjFiOUgCkuojYfLog4lWTDTRK/mVxoeaAz zoQ7tQDA96fep4qEMXK2ORSXl9BMKWS0ZSZM5zSc6DXzb1cj9hwdxdz2K0uRJb1aK5 E2KTZcOPhs8dw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 9426D64D46 for ; Mon, 22 Dec 2025 16:19:04 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1766445542; bh=F6uPsfipgV+62Sqnjt1R9Ao55eowKm0FAsYKqRLjfA4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S+vzDZZGSNGcwc1EAs9vsuBWP3/5nKIBtrFBX1VeANfy38tYgPU1o4EKqmXGWeLp8 Jj2qDgcd4ajLSzilOxRI6ko5k5Om1TMP4SD2rfpX4AX9WXJJE/p9rn4kb37dXLydVU dqNJi9zCqyovNfjreLcL9LutZY8l0kWHWf8Rru2/06+ZPQ+3TcFQ47qZ5rpR5gJWda KdrL0Dmq5yEjCHryr+jCeje+6k/TxXWhc94AE1qsoCMcRCAjwJOpKzCYP4q9k5xkeX 8A+pgZOdphD2QZ6fFuL2+NilWhc6gwjwc1sHFTApWQ9uXAWXF4rLjMbh/LFcc8riL7 xlEOiYNZ0hXSA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 259D864D46; Mon, 22 Dec 2025 16:19:02 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id p5CuC_guVFaG; Mon, 22 Dec 2025 16:19:02 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1766445538; bh=hnpqpmTawdnii+DAdPHtOkZjqaTpnovsMWxDEKK5rSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZcLT2ATtaJUXpDjdOS5rSy53ggBbPkchKn0/G4SWbA1nqxNUzKI4ixXXwTbTTSv6n VZ3oxWLyXz2SLRxYn3MdaSa9jbULYnsEVnhykn4Ey7bvMqCv3mI/QMTMZaQRlg0jT9 VWC1PJwrRcDjrb8JdSO2iIc4W7lLoBSKwQ2PUGPf0ZDz7kKlpSpXMvwIR8dIRfjytL VN5fmCyx18LHEaAjHOcZdPvy9ithd7HwTmuxHoGx28woFRUxwoLChM+APZ9ICYWd69 tNYUoZNUt+FM49sQb5ocD3uVqiZuv75OxWsORUlAGT9J/w+a/+uIwMyNy9eEXP6Rw9 MgZvLWWehs5bA== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id C581064CD1; Mon, 22 Dec 2025 16:18:57 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Mon, 22 Dec 2025 16:18:35 -0700 Message-ID: <20251222231838.2298178-3-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251222231838.2298178-1-sjg@u-boot.org> References: <20251222231838.2298178-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: OFZ7YTJ4QXJIJJKK4HIE4QCFDMN6HMVB X-Message-ID-Hash: OFZ7YTJ4QXJIJJKK4HIE4QCFDMN6HMVB X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass , "Claude Opus 4 . 5" X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 2/3] buildman: Fix flaky test_kconfig_change test List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass When CI has fewer CPUs than boards, one thread may process multiple boards. The .config from the first board persists in the thread's work directory, causing kconfig_changed_since() to return True for the next board's first commit, triggering an extra reconfig. Fix by forcing -T4 to ensure each board gets its own thread with an isolated work directory. Co-developed-by: Claude Opus 4.5 Signed-off-by: Simon Glass --- tools/buildman/func_test.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index e748d302561..31cff04a060 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -1285,10 +1285,13 @@ something: me config_exists[0] = True return exists - # Run buildman with kconfig checking enabled + # Run buildman with kconfig checking enabled. Use -T4 to ensure each + # board gets its own thread, avoiding .config leaking between boards + # when a thread processes multiple boards (which happens with <4 CPUs) with mock.patch.object(builderthread, 'kconfig_changed_since', mock_kconfig_changed): - self._RunControl('-b', TEST_BRANCH, '-c2', '-o', self._output_dir) + self._RunControl('-b', TEST_BRANCH, '-c2', '-o', self._output_dir, + '-T4') # Verify kconfig_changed_since was called self.assertGreater(call_count[0], 0)