From patchwork Tue Aug 19 19:38:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 25 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=1755632408; bh=Nv/NJ6BFpNAqyZ0ICz1zUBOg91hbskZsGJf75TLrdhw=; 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=CNw9Io4Pd1L6PAJppagUVT3CE5ZQxInADbdb5HmgEsKHO9QfbbnRqunhptnNCX69J 3alOastMuJKOECS5LFZhz2LdvuXWKs4X5kaf2VHF58kcn2DAeiLDVVJ3FIBpaT4H7s u+g1Mp8ctie5K9/+c3U2bcbD6DZbGg5eDZzNgDAdXAVSjY6OzLjfT8SgcTJdu+zzhW WNEfKyvnx+LnFoKP0vqRdGP/MmNTkg2iNfALt11PLDI7cdW+4ec12b7W9WNpsecY5v O1LoCbJq0YaDiWTIG5Iilfq4Vu5yEcqG0P+5v5uIICjB/yUxnHUTFACgx1baXjq4c+ 0xhHku/S5vZqg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 8FF406760F for ; Tue, 19 Aug 2025 13:40:08 -0600 (MDT) 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 Lq0xVCLmvKTh for ; Tue, 19 Aug 2025 13:40:08 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632408; bh=Nv/NJ6BFpNAqyZ0ICz1zUBOg91hbskZsGJf75TLrdhw=; 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=CNw9Io4Pd1L6PAJppagUVT3CE5ZQxInADbdb5HmgEsKHO9QfbbnRqunhptnNCX69J 3alOastMuJKOECS5LFZhz2LdvuXWKs4X5kaf2VHF58kcn2DAeiLDVVJ3FIBpaT4H7s u+g1Mp8ctie5K9/+c3U2bcbD6DZbGg5eDZzNgDAdXAVSjY6OzLjfT8SgcTJdu+zzhW WNEfKyvnx+LnFoKP0vqRdGP/MmNTkg2iNfALt11PLDI7cdW+4ec12b7W9WNpsecY5v O1LoCbJq0YaDiWTIG5Iilfq4Vu5yEcqG0P+5v5uIICjB/yUxnHUTFACgx1baXjq4c+ 0xhHku/S5vZqg== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 80635675F4 for ; Tue, 19 Aug 2025 13:40:08 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632406; bh=vRcrNHYU23XegivhuTCxu/htkILRYgQIczhXRAnqBxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WS0BCoLwX5nttzaal/J/WDmB85GbCg5kkynfgcRiivWeDGOTYZVKK7HHPN8FTAtCu 9mE1nVsqmf9Nfc7NlH2y0SArN9lDYPeAtyyVIBsl5UbEdwTjau0Ob/n6L2Oqv8BIIt 7zKoAz5OYOO5ck7VYBfsMQGkHT260J2FM1W9Zps8glqc/VbZkZ4FbhKEUmn5Jtskss d8204LFDTnxf0CplxkUMANp78rr8MfW+0Yna720XbIZ7myrstf2nZhjjngAmZ/+ovX MXHhd/7E5GISMAuOPcnCvxTocl+CHrNnYeFiW9ulFJwvYfwAKi7E7nSuKwItBkaO8b c+ue/LBEgGfWQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 24CD5675F8; Tue, 19 Aug 2025 13:40:06 -0600 (MDT) 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 dkikdbsGy6wf; Tue, 19 Aug 2025 13:40:06 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632401; bh=rubs6pA8h8fgx+CVnjEZerhc+bNhj7iJtZDD2SqeY88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OLCEvs54qbU+RqdHcdlXG61MbKIbCTiPozFWbxrlKWdoH2eCNWVul9CN9JckgqbjH Zx2OKzJ+T3S7ssGskI7diq3ulUh9MFg9rJNemlxDbk/RLCGKvvH8VuMumtWNzf1F8W zRpt0azxROQUMckwqfwfRVo/g6LVzsvsaMk+5AD/hMS+w8kob3xzOOZXwgg5jKxsg4 cioYj0PscoMNmRBUTEK9JvqdTmV6gYkCNgs3oAMYz1Et231m74H23MR14WM3cP9U6t gacrkuwOMEM3ZmQdiamBjB/UZQN0VTM2HryCeIKLTKMY4xUuPg32QESd3b4ArX4bg3 wtxDx5ibvtOrg== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id A616D5E436; Tue, 19 Aug 2025 13:40:01 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 19 Aug 2025 13:38:57 -0600 Message-ID: <20250819193918.874215-2-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250819193918.874215-1-sjg@u-boot.org> References: <20250819193918.874215-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: ONQRS2XH6KA7OVUSYIFW6CKGECLAS6UE X-Message-ID-Hash: ONQRS2XH6KA7OVUSYIFW6CKGECLAS6UE 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 01/15] patman: Drop hard-coded patchwork server 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 Since there is now a new server at patchwork.u-boot.org allow using this if selected in the ~/.patman file. Signed-off-by: Simon Glass Tested-by: Simon Glass --- tools/patman/cseries.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/patman/cseries.py b/tools/patman/cseries.py index bcbc4963cea..009e6f000b7 100644 --- a/tools/patman/cseries.py +++ b/tools/patman/cseries.py @@ -511,7 +511,6 @@ class Cseries(cser_helper.CseriesHelper): """ ser, version = self._parse_series_and_version(name, version) link = self.link_get(ser.name, version) - pwork.url = 'https://patchwork.ozlabs.org' url = self.loop.run_until_complete(pwork.get_series_url(link)) print(f'Opening {url}') From patchwork Tue Aug 19 19:38:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 26 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=1755632412; bh=XCQrrgRCgp9hzo2AKavNj0LQrGNFeW0pz9f2ULbujqE=; 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=AY7sFfU3PFJX2SqvTJ/a7DLbPKYm2Gm8tBPGC06IKrKDeNLneyjp5ZjhnSoI97Ajg RWdzLUcmOm7XIl72+JOHTvqsMvrPmhBexUdyFeobpaL1YCqBXGYEG2vCqxF64tuVS3 5gcCGub4VgjHhRqpBQqa+TFk3BFkQ8awxGWGwhazvvghN/k9azuyJ1Q7Kie+rNi5Og o1Lm3WEzYZv9YzQtjcOH5rPTT+wF3UYXrhogCpiFDGxWGCKBdvMlIeDGKpTtbN95mK fqjiQtKmLpbvB/rzQc80/H+y6/Ht47gPm19BicywirX9M4bWIfWTGFT123azG2Pc/C W+EJPl5mSgi0w== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id EC8A36760F for ; Tue, 19 Aug 2025 13:40:12 -0600 (MDT) 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 fUlIqhm4-8BN for ; Tue, 19 Aug 2025 13:40:12 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632412; bh=XCQrrgRCgp9hzo2AKavNj0LQrGNFeW0pz9f2ULbujqE=; 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=AY7sFfU3PFJX2SqvTJ/a7DLbPKYm2Gm8tBPGC06IKrKDeNLneyjp5ZjhnSoI97Ajg RWdzLUcmOm7XIl72+JOHTvqsMvrPmhBexUdyFeobpaL1YCqBXGYEG2vCqxF64tuVS3 5gcCGub4VgjHhRqpBQqa+TFk3BFkQ8awxGWGwhazvvghN/k9azuyJ1Q7Kie+rNi5Og o1Lm3WEzYZv9YzQtjcOH5rPTT+wF3UYXrhogCpiFDGxWGCKBdvMlIeDGKpTtbN95mK fqjiQtKmLpbvB/rzQc80/H+y6/Ht47gPm19BicywirX9M4bWIfWTGFT123azG2Pc/C W+EJPl5mSgi0w== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id DBB57675F8 for ; Tue, 19 Aug 2025 13:40:12 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632410; bh=f13w/63TXmjaCqxUbqMD1vUSR06liBNdldBlRszu8Hc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qjjM/GiIBaC8cFrmhiQ3YX4U7s9pwFhmVQ1FpUfSJAmgLyAw6MytaH+RI/Tad8Mos HWn+zYSar5latrMhUIPGkay7i6gSrHUzz/0Y5B2EWkGm7d8zKFZN4XXYmI8TIoKDqf bmZMCkinxcWhRH4EJP23SlCMqKLQHEsOJ9vC76dS9c8jKXg9+x5Puph2w/7ZsbsU1S 3W9lXjptu1rf25ZL8P8+L/PEutwP3206G0Nplw6hfZPERYMLgRPeHxm6Tz3A9OXjR6 6pFkhZez5OeNbMLtwqbV1ZlakdJ+9EztVYqsC/Sr0djWwEY8tezFOvp1fuVGYW79M6 up9ZddGZfZ4Ew== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id DC4F6675F4; Tue, 19 Aug 2025 13:40:10 -0600 (MDT) 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 hQBdNqA2sR40; Tue, 19 Aug 2025 13:40:10 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632406; bh=KN1YHulragDaEX5JCOCUu88LP6uM5KYvj7BUdjCl8iM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BAVa41K9vpNUST/+zvaEOze6SWv2oHIkTVCWi2Z6mVD+NTNuB4qTjDAv8cMyh++MV wy0YGPxEeUW+oCgjh1Og1L+Hi01Gu6hrlq9vhvx5jWgTiO2syTEGhu0PXMGiM+CYjs goWB9+UF1LKWBFwJXA6es0fLc97qeOrCrl3sDMpER4OZtLOaDGzGTjTjz6eIwCP2fg vH7D85wHHRanTejkL7/8RVOWvTryz8NX76UkaSiLYnLPK6d0M7WHJXfZO83m4O66CM iQLshRDu4ixLbP57zfIQCY7XNKRtog7+//jMJQSA07RN/ORPQmmjs4QHSEa0zcKR3a 1lqQQrS8Vl7XA== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 6D3575E436; Tue, 19 Aug 2025 13:40:06 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 19 Aug 2025 13:38:58 -0600 Message-ID: <20250819193918.874215-3-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250819193918.874215-1-sjg@u-boot.org> References: <20250819193918.874215-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: UNHPJ2FJZHOBZZPPI6WZZ6WA4KZYO6PI X-Message-ID-Hash: UNHPJ2FJZHOBZZPPI6WZZ6WA4KZYO6PI 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 02/15] patman: Handle invalid characters in patch files 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 In some cases latin1 encoding may be used in source files. If 'high-ascii' are used, patman may report an error: UnicodeDecodeError: 'utf-8' codec can't decode byte 0xf3 in position 1051: invalid continuation byte Fix this by replacing these characters. This may cause the patch to fail to apply, but at least it can be checked. Signed-off-by: Simon Glass --- tools/patman/patchstream.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index 45040877f8c..120004a3e0d 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -831,7 +831,7 @@ def fix_patch(backup_dir, fname, series, cmt, keep_change_id=False, fname = os.path.join(cwd or '', fname) handle, tmpname = tempfile.mkstemp() outfd = os.fdopen(handle, 'w', encoding='utf-8') - infd = open(fname, 'r', encoding='utf-8') + infd = open(fname, 'r', encoding='utf-8', errors='replace') pst = PatchStream(series, keep_change_id=keep_change_id, insert_base_commit=insert_base_commit) pst.commit = cmt From patchwork Tue Aug 19 19:39:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 27 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=1755632415; bh=xz3MFh7rDZKnDb8PrDzcz2p28GiFnPRtTtrntM4XeSo=; 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=mGzgO4WEkhvkRW+jYDPuM+WHAb3YwJ3N7KxoXviEcF/L4ypdrfH8UYbBQxIK0tcXl nnHl/Fmv/1ID3+BfnM5kUZ0ltb+xNg0Vf65Oy+LxTnD7FG/NCvWIKV8Wqp8D6ir5Ab LlYXt6BC3YaldyFviS7xMA8l6KZrCh/W7ge9B+QZzaLfexQjDz61Aqb3nmSANnKXsf JzS8TBePsCBscWzYdpX6k8HxnK04d+GJ7w6dLIj7lWA2gdDgmPj+t58b+Tdipm9usl 6PtYRFXQRm382CutnyKibHPiLB/dslKcxDZHUZdKtr7buv4H9HrPGdg3/f70wy3A2m Si/vuLYkdwifA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 88B9D67619 for ; Tue, 19 Aug 2025 13:40:15 -0600 (MDT) 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 g5fNoVg9u5l2 for ; Tue, 19 Aug 2025 13:40:15 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632414; bh=xz3MFh7rDZKnDb8PrDzcz2p28GiFnPRtTtrntM4XeSo=; 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=OEnkC4jOZjIcYu1qem8LE7wl26cXV494ZTMtwf3i+0fTl484ee5He05M1qfMIt9fT rBfzOl8+3tJmtSIuvbGLWH+llP0yCdpd3TXN8viifdAbIJHy1owygUUKTEV+iQWLpn uEqCyAe/RRcCGWihp9Z67MIO99dGcXF0szOPgADQETQ+TkK8WtGsolrJEkaFS88vsX Mu+br36bkf+3n1+9ElBNHkjhLugPZr0iOXzAHpKj7Iv0OoheS0SAWvonpzIKh6WKiE PPvUz5GvJgZTKg+1JFbxgpBuJ3QZ1Ko7W64Ir1rmzJe68tbWQPz5N78zmO/za7s3Ga gfqJan5Bi9FUQ== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 1C4D867624 for ; Tue, 19 Aug 2025 13:40:14 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632412; bh=lL+WNpqJwRPZaWYO4kfnO6W2HOuf2xec2rNEdJmDHZQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uM87/TJ0kmitM6h6MEwnp/9liyZgtsYSjUNVPGCc7zVoOObUnL4FH95kUAMev0An3 Gha3cvTH+10d/NQYUCQmJ6CvxYvTpc7BqKZXzXCylwJ3WmHH+jD3hBysvUi2772N+H stjpMeCJFoXXMQljA+1F8fEXdHdTj7f/4pB2L2z7fWKQVnli1mt6z8IR+1jHql2Xk8 G3wdNHhOxG1v8/scX53A7x3DiZz2xUmdhmqO6m+2Yq1M7GjK3qAFyCJiTZYAGU2qJg Pj/U9/+WcwyaMF9NPSeDneSNiFIzS6Nfx59BRpGUvkObc9mYipPw1E9J9qoopa2NQN BrpzGpFGd3UHQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id A67155E436; Tue, 19 Aug 2025 13:40:12 -0600 (MDT) 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 JDniNUrntiUR; Tue, 19 Aug 2025 13:40:12 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632412; bh=REFaWQNbZq5opRtvM5tRaifyIJ/XxvWkm0WeNTsCoXw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Utd93spKsxFm1qNHx8jEZ7UWX3Nqc8/ljVyinaoRV8lzn2gaovVrPpp3hCviujQvK rkkNqHJG041mwpqeyOaUEQd5Oa3ZFqXIv2nfkp5NCSPDLQ8MvDtFAhY3s0fpK1HzQW M0qWu5BbOS9GmbhVK8fZJqV824MRGsIdruFJtrw5LQ/eCaKjxfzYoO9QWFZQgQnI8o NISlMQD4nzzz3UdgXgOztEPBCiBBll01V6GzWjmakCfV262ZGkvDAGN9rRgjAJFL0V SwnI54JsUZaG+mYvwbzYPjAHTgvbbrOBSM6qytRxZQxJH4hJ69CAdSnd35C1t274M+ ritxRPJXbWAIw== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 28035675EE; Tue, 19 Aug 2025 13:40:12 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 19 Aug 2025 13:39:00 -0600 Message-ID: <20250819193918.874215-5-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250819193918.874215-1-sjg@u-boot.org> References: <20250819193918.874215-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: MLMGPUVX4FL3FLRZQYNF7ENAPYM3BEYB X-Message-ID-Hash: MLMGPUVX4FL3FLRZQYNF7ENAPYM3BEYB 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 04/15] malloc: Avoid defining calloc() 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 The C runtime calls malloc() before starting main(), e.g. to get some memory to use for dynamic linking. If CONFIG_TPL_SYS_MALLOC_SIMPLE is enabled, the calloc() symbol is defined within U-Boot. The C runtime may call that too. Use the same #define technique as for malloc_simple(), to fix a crash on my machine when running: /tmp/b/sandbox_vpl/tpl/u-boot-tpl -D This does not happen in CI, perhaps because the C runtime uses malloc() instead of calloc(). Signed-off-by: Simon Glass --- common/malloc_simple.c | 2 +- include/malloc.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common/malloc_simple.c b/common/malloc_simple.c index f0f90a095bd..d820ded68c3 100644 --- a/common/malloc_simple.c +++ b/common/malloc_simple.c @@ -65,7 +65,7 @@ void *memalign_simple(size_t align, size_t bytes) } #if CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE) -void *calloc(size_t nmemb, size_t elem_size) +void *calloc_simple(size_t nmemb, size_t elem_size) { size_t size = nmemb * elem_size; void *ptr; diff --git a/include/malloc.h b/include/malloc.h index 9e0be482416..728451086aa 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -882,6 +882,7 @@ void malloc_disable_testing(void); #if CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE) #define malloc malloc_simple #define realloc realloc_simple +#define calloc calloc_simple #define memalign memalign_simple #if IS_ENABLED(CONFIG_VALGRIND) #define free free_simple From patchwork Tue Aug 19 19:39:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 28 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=1755632417; bh=d3zPFnbJjvyxixIjhOaR5NLuuVoRpgKFCiKRrul9zkQ=; 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=SF/6S5yCTTqVmo09gJoCdT+RLtnWK4kmkTUKqaJNkTWusOdaWsOfAdYMw0hZzSLyh V0jYXI1vSdKCg56I/3Q4aQQOIUb8WlqZCTjDaSvxul0NlxgPfOJ7IuIM9hKVCzCB81 Dsnwi5sP6+cyT+0I09+UocnDvfeVSXTEJRpMAyDomSQxQkZBbieXy6C95AZIo2trnx cmm9UMgkX5j7CBDsaGjI+TS+0v17pmL2vL8wV5TlHNsLrxCSHFSBGHNLLYlrt8rMw0 jtj6ECE2Iw1TUBiKm7QW8SFuG275QNO2FNPwaqAEopev124xywdShNfYOYrjIW9Uyz PUI7ag6obGggw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id C436867622 for ; Tue, 19 Aug 2025 13:40:17 -0600 (MDT) 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 nB04m14TJDs7 for ; Tue, 19 Aug 2025 13:40:17 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632417; bh=d3zPFnbJjvyxixIjhOaR5NLuuVoRpgKFCiKRrul9zkQ=; 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=SF/6S5yCTTqVmo09gJoCdT+RLtnWK4kmkTUKqaJNkTWusOdaWsOfAdYMw0hZzSLyh V0jYXI1vSdKCg56I/3Q4aQQOIUb8WlqZCTjDaSvxul0NlxgPfOJ7IuIM9hKVCzCB81 Dsnwi5sP6+cyT+0I09+UocnDvfeVSXTEJRpMAyDomSQxQkZBbieXy6C95AZIo2trnx cmm9UMgkX5j7CBDsaGjI+TS+0v17pmL2vL8wV5TlHNsLrxCSHFSBGHNLLYlrt8rMw0 jtj6ECE2Iw1TUBiKm7QW8SFuG275QNO2FNPwaqAEopev124xywdShNfYOYrjIW9Uyz PUI7ag6obGggw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 6C83C675EE for ; Tue, 19 Aug 2025 13:40:17 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632415; bh=bJEwyZG+VbOSQIX85AYvKelAZIuKn+SK+B208XLuzB8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pLUEym3Mpf58Jt5HZkV0I+HSu4arEBGhq7Q803TK8Qsg4atEYDAsJOtFgSQeQQUmd RmiCKMlLfCCXPEFQQrl3p9bFDtN3M183yZ/KY/9VU51y7o+vV/VrVL23qRfYBTf17g EWfckfF8CUBz0FPUbIlX+6k837qclimPm0bh/NqXUdqcoA0FyjwVBfFtUZJEyfR6Zr HGWD0NYTIPHXZaZ0hjBhv/aAx7hNw6f6hKRHMTif2s1VLlrntgvxX1HR1aqkkq7q5M pGy68nWL3I7AyLNlP+TeBtJJtUJxkqTBhJK77crQmYeY0iKkl8JmnZJcFIXQK065F8 pSXkNWgDXH8cQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 42A646761A; Tue, 19 Aug 2025 13:40:15 -0600 (MDT) 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 3C8nwXYkuaGi; Tue, 19 Aug 2025 13:40:15 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632413; bh=daVGLm1RtFEj7dQAfMP5ljpeak1gaKQ1yxdtTXfOGX8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ug9vMBiYe+LWegxQYzM5k8C/n887w4umB607JQeZF3LvYD9zL8Mkx8NWK0qFTvmgN s/5wedd1M48O3dn7o4VVERPr7+/YdYRG0c32ubtKsI2Iu7D7JHPUcQCwvvst+hyYeJ 4X1I9G4M9KGTuPNDE5uVjnb/7QJUUEMNx8kYMrUF0//tqYpZRLm7jkf7PM+AuxB8rM lq0xGlFJMOHx8Jsk4UVOk3zbowyOXNqnIHbMdfaBUr1IRM1of1y1Nni9/ws6wTC/e3 aPoaTefpPx8vd0U6jnSAfLN3guQE9jcingx9Tks3M511BXkIH7o0ndZLle7ReG0YYH mpguXUzTRVsPg== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id F1E54675F8; Tue, 19 Aug 2025 13:40:12 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 19 Aug 2025 13:39:01 -0600 Message-ID: <20250819193918.874215-6-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250819193918.874215-1-sjg@u-boot.org> References: <20250819193918.874215-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: YBYWLO5I4524Z537EZRQN7KAK2KARH5G X-Message-ID-Hash: YBYWLO5I4524Z537EZRQN7KAK2KARH5G 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 05/15] buildman: Deal with DTC in environemnt in test_skip_dtc() 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 If DTC happens to be set in the environment provided to buildman itself, this test currently fails. Fix it by removing any DTC variable before starting the test. Signed-off-by: Simon Glass --- tools/buildman/test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/buildman/test.py b/tools/buildman/test.py index 735203e934c..c7000b58bdf 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -1012,6 +1012,7 @@ class TestBuild(unittest.TestCase): def test_skip_dtc(self): """Test skipping building the dtc tool""" + os.environ.pop('DTC', None) old_path = os.getenv('PATH') try: os.environ['PATH'] = self.base_dir From patchwork Tue Aug 19 19:39:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 29 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=1755632421; bh=WKLZOlhEd11MjJ37Zbe50wBs/KYK07J1NXgt7s2MqiA=; 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=gRHNLOa+fuF6Iiz3FHJ6/tJXKEt4q3EomHmKMnYcTBFIhm2Vjzm/1ekyc1PQgFN5N zLCM2WqXqvCBpVKYRYu4aqVkdK52hb4YghbgDu3GkEe7x2GTYbWV4oZ8uYW27coiC7 U3emvIWi0NDlgaWRGlU581pv2QTFfLtd9OJWusyE/fXZ2VDBLKSDkSd6KQSUWflp9T /ChPX1thu38EY0kNPs3+qt8BdB5+O8JtBDH2gXhBBuLNhml1dNbZqgRYtVLsQxC5Ue HRIH45ntqmE+am7ECnsEZZHpg7M9Un/xYHus2XF46jSgiaESyzDQGhPa8+z2rYmaOu 7ih9Q4CWoUs7A== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id D5CAD67619 for ; Tue, 19 Aug 2025 13:40:21 -0600 (MDT) 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 ctVt3lcWt1g4 for ; Tue, 19 Aug 2025 13:40:21 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632421; bh=WKLZOlhEd11MjJ37Zbe50wBs/KYK07J1NXgt7s2MqiA=; 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=gRHNLOa+fuF6Iiz3FHJ6/tJXKEt4q3EomHmKMnYcTBFIhm2Vjzm/1ekyc1PQgFN5N zLCM2WqXqvCBpVKYRYu4aqVkdK52hb4YghbgDu3GkEe7x2GTYbWV4oZ8uYW27coiC7 U3emvIWi0NDlgaWRGlU581pv2QTFfLtd9OJWusyE/fXZ2VDBLKSDkSd6KQSUWflp9T /ChPX1thu38EY0kNPs3+qt8BdB5+O8JtBDH2gXhBBuLNhml1dNbZqgRYtVLsQxC5Ue HRIH45ntqmE+am7ECnsEZZHpg7M9Un/xYHus2XF46jSgiaESyzDQGhPa8+z2rYmaOu 7ih9Q4CWoUs7A== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id C3EBC67608 for ; Tue, 19 Aug 2025 13:40:21 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632420; bh=bCFg7XgmvqS9iabWEZ77ppBDmNWIWuuXEqFB352pg70=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hRD68aNn1isNszHPL49jIRTcS64AjQfOTFh/CyfHbOMleJKJnCu277MLd1v4AeW4F 9CCRv+2GmZgpFyTTP7beBDj2X8rm3B2Wks+ZO0vOCg5xdevDz6SPql1CK3oYhA3mKl /p342PN4sRoOCAB722LyENDfEoJ/TUC8Lepj0LVpQRlLt1La79jwQ//lqiuSXMNlLT ypT+TtLzP7/wNKnMr8hPE9G7qG+nq0wPg9se68W2qQ35aUeVVxtl0ibXHDw6B++9O9 VcCCVBMVqyCjeQk1emHaM5oiyfDVQq+oM6AnHx43jzlOJPfG0stHLr2y73GfDKt9GD 81YqTJw5PQKUw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 06E94675EE; Tue, 19 Aug 2025 13:40:20 -0600 (MDT) 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 axl-b1ztO4Yk; Tue, 19 Aug 2025 13:40:19 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632414; bh=JqV2+wwneYu8PedKXfwSVrbzVG/3ip4ClOtl0PdL54I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=whd6RGZByJTrnw4aXwHXGH9MEqQhzur//bw6reDycuuaQVge3hjnJ7rLBZqL5gQrp V0IJuHZoiC8ftcbVpL0HvIiaxtwSG/HDyU7mCgBh1e1ubC16MxXEzdF+nlEpmO88bD CiJmKPkKnJV8y3D6yAPt7a6Y+MQULys5u0cFMhfWVOlEYlzmtlSSZhlxc4tlC21d5I 0qiwUciInRLA2XqxZJVEv/8SVZH2x8rf97hrNnf8VEkHjMRsgRKUaT2NBeTihBejaZ GPy3oRVrS5+7o/GCQfpRNW8bBNnuYLZ4cu1wFIabEPwTp5lIZNDYUfNd6agVj7ou6g mF6e2qebXYV4A== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id F081D6761C; Tue, 19 Aug 2025 13:40:13 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 19 Aug 2025 13:39:02 -0600 Message-ID: <20250819193918.874215-7-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250819193918.874215-1-sjg@u-boot.org> References: <20250819193918.874215-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: NWBDUAPPXVWWTUTVARXJCBHGI46TCHQD X-Message-ID-Hash: NWBDUAPPXVWWTUTVARXJCBHGI46TCHQD 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 06/15] buildman: Fix pylint warning in test_skip_dtc() 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 Use a different variable to avoid overriding the toolchain module in this function. Signed-off-by: Simon Glass --- tools/buildman/test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/buildman/test.py b/tools/buildman/test.py index c7000b58bdf..b4e612bc5d6 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -1030,14 +1030,14 @@ class TestBuild(unittest.TestCase): build = builder.Builder(self.toolchains, self.base_dir, None, 0, 2, dtc_skip=True) - toolchain = self.toolchains.Select('arm') - env = build.make_environment(toolchain) + tch = self.toolchains.Select('arm') + env = build.make_environment(tch) self.assertIn(b'DTC', env) # Try the normal case, i.e. not skipping the dtc build build = builder.Builder(self.toolchains, self.base_dir, None, 0, 2) - toolchain = self.toolchains.Select('arm') - env = build.make_environment(toolchain) + tch = self.toolchains.Select('arm') + env = build.make_environment(tch) self.assertNotIn(b'DTC', env) finally: os.environ['PATH'] = old_path From patchwork Tue Aug 19 19:39:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 30 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=1755632424; bh=qzguj3XQfMNRr9kOj+DAcbKHj+4qA7qmLUaSAx9cYSA=; 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=sxgZn6J8FYauugI5uxQfX47zG1GdE00WmdNbDUncJGHYMiZzu1kT1fXFQft0j0SSV OBFTP/fXzDXASWIAsx6tR7RnP8GRxySMx3nu/MYuPdLhPF7naEYWTDIiEWik7ehQZV uwJk55h3eYBVOttIOw8BMxHbWy7z2QyaA/Jp2XuYTGIWiSOH89OIS9vDH2wdv43yDb 2OF2DKOjGBgOd63N7lhioH8vkB5EC3eNX7TT+5e94wKJlUywXAvIYhMaO1DOjPwFhm IYkNYJ7y+WmNs6m/arD0kvkY2YGN/iisu78yZgUfRwd2tf+1d4yANLToW1H3L1Mm5x oaum6y4lnq6Tw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 36665675F4 for ; Tue, 19 Aug 2025 13:40:24 -0600 (MDT) 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 Ili-unOY4qvk for ; Tue, 19 Aug 2025 13:40:24 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632422; bh=qzguj3XQfMNRr9kOj+DAcbKHj+4qA7qmLUaSAx9cYSA=; 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=OT3UsUzbqqy0FvkRBXOcIjoeJe4EkCoVb+ua79MYXfmnPieVEU7unDFJcvaA1StF4 JskJVhc042EWrc+Yj+p4wo6momuPtqdCWLqoTH6V126waq67Ib1h7q/BN2SUcdBy7J v8oQBn80VSsQDWHpNdGYiC8/aZNO8HwTAyNjKXWwdMvCfciAa+P8kdDYw40SXwKQMn 4/PB1orZhzLHb6N+Jf27vjUUA3nAuJK1hurbl1I3dx+u3viymVCXc6eSFFcaYCjZnI hTchj28BhqV8Cv4TaonnX1JvDu/IxmwJJScE/MflsX4aJmA4vwdJyy0eF3uKj0nKD7 p3+sVmFJ8OpIw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 30DDB67624 for ; Tue, 19 Aug 2025 13:40:22 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632420; bh=BkSbEH2FJXsPMyajXfvFvNreg+JPSpnIaiFs7wpbz4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wvvqJL7Bp9npuJSz1prOwpBfwFE2rHDjOnqpPtN3MJRnpbwqXgJl1P1rVrvHUg/xe Ah85/JnAm+pTq4JutVyVKknhNr3Kn28shdlx4nTcBKBXhI/MJNoM+PVznrIoIB3Ixt pQnATKqK+MwainUz9x+SBAlyCE9ugVUfjREF7dCfoq3cJSiFgSZYCwjBNyRcM9lFWj ggjJpAluvu3wvxN+SkiUYdxJpVYihIrTKKGjelZFUAvWOv25eleloAtqNW92+sbXfK qLKUsYz8l9AmPu5YXdizJUssq15BmExrjfY3A1tQviiDG9sJIBEH9Mu0SF/Hy1DhE5 GlVHHgurOPESQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 4AE0167608; Tue, 19 Aug 2025 13:40:20 -0600 (MDT) 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 TgYKUNs7FRa7; Tue, 19 Aug 2025 13:40:20 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632418; bh=6VS4tcjKWU1K388FSJskhTdlcUM+90j6BHRFO1ewjYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z4IQP0sS9o9i4k9wNaGy+gUsNPDrVeslCzVNBGhSEOUiFm2ky9ILlQQW9SNHJJNDU ZCLF8yDj4SwjYZxLj1MApRHRoXHJ3p5XRUcADpS3+fsY662fRHdPKuw8TkPNnQRrmv qdjAPRNzpd4tzjNQxYXlPaJ4Botth+BV+vLS/Y8VzZXzuyd3KKoImxlL9YFGpfOAXu +xGSPpBjdAqsPLXFDrqRquS4BPdiGoyvEbH2T7Isa2uGkfVtwAdjenaZ6D83G1Qniz 4ZaNYdkiiH49Bsmq+elOXHKNRwASBclHrrAQSGU7cmzpS6rUo/iGCXr4tAIRqcDAuD 5Vzit7QO80Wsw== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 618565E436; Tue, 19 Aug 2025 13:40:18 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 19 Aug 2025 13:39:03 -0600 Message-ID: <20250819193918.874215-8-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250819193918.874215-1-sjg@u-boot.org> References: <20250819193918.874215-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: GEVVIC4HG6XHFGFYK2MTOQEYBFQT3TDU X-Message-ID-Hash: GEVVIC4HG6XHFGFYK2MTOQEYBFQT3TDU 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 07/15] buildman: Handle CPP being in the environment 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 If CPP is set (e.g. to 'gcc -E') buildman currently gives an error. Add a little more logic to handle this case. Signed-off-by: Simon Glass --- tools/buildman/boards.py | 4 ++-- tools/buildman/func_test.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/buildman/boards.py b/tools/buildman/boards.py index eaeeb5ec8dc..2330315fe95 100644 --- a/tools/buildman/boards.py +++ b/tools/buildman/boards.py @@ -247,8 +247,8 @@ class KconfigScanner: temp = None if b'#include' in tools.read_file(defconfig): - cmd = [ - os.getenv('CPP', 'cpp'), + cpp = os.getenv('CPP', 'cpp').split() + cmd = cpp + [ '-nostdinc', '-P', '-I', self._srctree, '-undef', diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index 968765b713c..6fc08e02fb8 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -427,7 +427,8 @@ class TestFunctional(unittest.TestCase): return self._HandleCommandSize(args) elif cmd.endswith( 'cpp'): return self._HandleCommandCpp(args) - + elif cmd == 'gcc' and args[0] == '-E': + return self._HandleCommandCpp(args[1:]) if not result: # Not handled, so abort print('unknown command', kwargs) From patchwork Tue Aug 19 19:39:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 31 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=1755632424; bh=lL397nAWy/mGQ9zhVpjEsCvoimef00aLMqWD22aUgIE=; 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=EPFoHWJX5MnzURYlnMWk5XOv3FcqlvaabknBukd4zJ9rCCKS/e3VAYLSWERam3ELA Q93Msyoc57XRcmwXFg6yijYq7WEJd5q/9G2GrSLNWSXWK1ZOcZNycTFOLqZv4frJwA 9Fk8oxFFTqT9fFf4DlLHm+JZAcVy/DNGRf1Kio6ljknjnT0toRWenwflaEwaOnP/cT FbK+CTQzcPdmWgVtqo8E3Yld2UVJP1jiqekQSt+zatEnZxxZOubn2OrbW32Diz/bYG KfmhzUr0IP6P150fvvIlvJa1IQGHuBXFDFP01Vi1NIeSLjPmBLmuEitfSNVudTV1/L DFf1Gl4Dn4HsQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 745776762F for ; Tue, 19 Aug 2025 13:40:24 -0600 (MDT) 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 TzPus3RMxStF for ; Tue, 19 Aug 2025 13:40:24 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632422; bh=lL397nAWy/mGQ9zhVpjEsCvoimef00aLMqWD22aUgIE=; 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=eIrpAZZQ46q+N8hH5M/A/ne6ivNqtkq3i1pBEUcPEuxS+WzCX4NUkbs6WIXQCu/vu Uv2q8gFq+E0TbXlgtDljf5c5R3ifh/OY7BfLokLBS+6FKqO3jPH9/gRznOclUf6Od8 heDb2D/U/fxZ+buatHPHhdILKQc18KLo6p86zD16MxW3vnxvKv8+AG7qF0eL/3g8nQ BRsJNJnpiZVRJz0UUFu0yqPskC28Dtq/4EmW5WxJlPP1g2ahdD9JWyAX0/VPMXnHNq beyVE6qAssCb+jpLzVlumECQVWqCA2xBZ23hQU6PfYluwDtIJkjGQGm2PQkYolNtEf S5J66sseQa6kA== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 80C2E675EE for ; Tue, 19 Aug 2025 13:40:22 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632421; bh=gpS0NuGKg+KVSHDSecktDvoSenYCH7LDx+PWf/T2wn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hckv4tNV6pnUI1a8ZQozkw2RUU0egB/+bOFi4DfhcWn93pE99Hd4Q5kC+/RnLVs2y qDwN/17HeY8VgP0nxQn5Yl0ryQ33Xx2IWspzUDhJ6O2i7KbZWJaZIuK9yRcBgGHtcG D32s1cB/bfnyHeRN4cL9bFrlJCXEVbOJb+8u++AGOZlTvLVttwJ/NxPAfawWpGr5VM xwrw9DwofFDtQ1bt2J3X9QlJZlrzWTQa+gt5+LmfH3rL92B+QE50dDsWR52DstWYLZ Imvq7Xg+A9qulcRylXxaITIER4FJvxXpxmTxiCwJHZGniBDkz/gBEme0SssMEu5uJy /bZkYglT6HrjQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 0F98A675EE; Tue, 19 Aug 2025 13:40:21 -0600 (MDT) 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 saNtL5Lb4u4u; Tue, 19 Aug 2025 13:40:21 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632420; bh=YV9PbwuixokVa5ZLrR1tvWEmCE3qXqsQ9V9NLsHj5UM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pbMvGftQDfWGtDbkbDVXviZZPZ6FuZPyPAyZIg7mJYTrIfWki1c3lvcrHOOKKgyYj gDQ2D9+oEuCnirfUXbLjMY0lsIJWojcwY/rrbx50ot4XmEDOODyB22sUHjpUNcNffH SyGge9SdPEJvJ2mrNr8+OBj1KJAY3YOgD1cxGl0Rbho25e9gq4ffDtRSq77kjEXPNz /0mFNIeSTAdn25/XZW7+Kqu3W5FZGIfeV7/k+f+Kb7LigYie2C/kJfQ+ihU6cG9wdU eY8gf3YIfxamrggmGKVQJLGpOkU8V3mrPf0ma1pbEZrLyYnqjJt0VE4edv2IgOWDnu TEC4qqhCuQzhA== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 973D25E436; Tue, 19 Aug 2025 13:40:20 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 19 Aug 2025 13:39:04 -0600 Message-ID: <20250819193918.874215-9-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250819193918.874215-1-sjg@u-boot.org> References: <20250819193918.874215-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: ZKMRM3OBT3XDOZWSHR6YTNXKRHLMMTK2 X-Message-ID-Hash: ZKMRM3OBT3XDOZWSHR6YTNXKRHLMMTK2 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 08/15] buildman: Handle CROSS_COMPILE being in the environment 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 If CROSS_COMPILE is set in the environment passed to buildman, testMakeEnvironment() fails. Fix this by removing the variable before starting the test. Signed-off-by: Simon Glass --- tools/buildman/test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/buildman/test.py b/tools/buildman/test.py index b4e612bc5d6..a134ac4f917 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -650,6 +650,7 @@ class TestBuild(unittest.TestCase): def testMakeEnvironment(self): """Test the MakeEnvironment function""" + os.environ.pop('CROSS_COMPILE', None) tc = self.toolchains.Select('arm') env = tc.MakeEnvironment(False) self.assertEqual(env[b'CROSS_COMPILE'], b'arm-linux-') From patchwork Tue Aug 19 19:39:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 32 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=1755632424; bh=vV1+vkJd3iQKjByHJfAWHw8ySoiUmvVcgmVc40EKp3s=; 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=KB8zm/FRfSjS9hYY8XWJ3jbxMFJrxU9YWFKvz19fqJDqhFex3NzheRtgHPHGHktg+ hUA0tMVUM8rrdwXTWw4xwbd/PZD6VOQB9wKEJAgoh0PEyqy6BznM1YBlAestMw1/C2 C97dd4mVv6th08Do8Wn17izl/08eccQlUqjzLGH332L56oZ/bJ1WqNr0L07u7fKB5n zC5DIdHXV33AHwuPOlLiEP45wz4whf/msD1WUgTiU3gWTW6HijvZxayhagn/QZdtcj 5g9KvQUzY+g7tuzVTjgiSZeOpqp7Sv5X8NNdPyPv+Ep6eumhnpYV1jmijupgyIHJim alg9OXLMJW6gw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id E4C73675F4 for ; Tue, 19 Aug 2025 13:40:24 -0600 (MDT) 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 pTdklXrm6V6A for ; Tue, 19 Aug 2025 13:40:24 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632424; bh=vV1+vkJd3iQKjByHJfAWHw8ySoiUmvVcgmVc40EKp3s=; 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=KB8zm/FRfSjS9hYY8XWJ3jbxMFJrxU9YWFKvz19fqJDqhFex3NzheRtgHPHGHktg+ hUA0tMVUM8rrdwXTWw4xwbd/PZD6VOQB9wKEJAgoh0PEyqy6BznM1YBlAestMw1/C2 C97dd4mVv6th08Do8Wn17izl/08eccQlUqjzLGH332L56oZ/bJ1WqNr0L07u7fKB5n zC5DIdHXV33AHwuPOlLiEP45wz4whf/msD1WUgTiU3gWTW6HijvZxayhagn/QZdtcj 5g9KvQUzY+g7tuzVTjgiSZeOpqp7Sv5X8NNdPyPv+Ep6eumhnpYV1jmijupgyIHJim alg9OXLMJW6gw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 6F1B467608 for ; Tue, 19 Aug 2025 13:40:24 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632421; bh=6nmnjaCtmTdtBzWnL9ziR0shbPQz7S5w/XNpnKgoZ+4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lhd8WKmnfdsiNqQA8aNlcFXbSZpBmYWxxD4lG+k2Za5P+dN3vVYemG/zo2Xqboev3 Bgjw8CAjz+8t1tkRuHsBvdysxln1HYgkeOOghFeNcYGSIYXJKQ9xJx3P6x9MxdoovR tsR7LqA42lX8AcESWcAhTD7EMYlcvBKpRyR42KizWFtwNEtJir3pxF18KHo5iHrrYw PQceY194r/CiaNmRqPj+S7tByuN9QExSEnvhhTkRCvaSh0QmmEIb5z26Q8mW5L//OO 3bczGz7bmavBIr2Wa9Fqzk2bqE4JRDDsVUy3Z3Zk7ab2mT8nnw9wvzLx52zb9lSG/X a3EUBjWTMUsaQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id E0AE567608; Tue, 19 Aug 2025 13:40:21 -0600 (MDT) 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 kHegQHBBn12E; Tue, 19 Aug 2025 13:40:21 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632421; bh=hclzkzHoIPhX0pgjD9JNMFmpGJWVxj2sKXOf493AfR0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ih9ki7zEBzrhyYIhONuXP0FJLFm1Uesw+inKgI0mD+Osu3lupyHBj8rZSDaumdEbD vACF8E19X0nhnY6OtpxdO1dgyIFMyA0x7eiaCl3XmIOy34zxOe7XSgMb/wqM5q+Xj8 o9rgmT2Ahs+q+4kH8KorJizDgkFkoLZ62mcacFTv4u4Ei7Q+IXzlN6eTLuywQkrcHg ZYB1JNeUJUvEkLnNa4cvAOogpGqL1WTRTmrhWHfy8HTVPXKvOCLcOgo/2/oIe5/Xox 4N8D3IznnwrETjeeykX1PPorRcWo4tt5gAjz66PCo/DJ+j+AyvYt9I+dbpmAvo6KS9 raVcUNlEQLQcw== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 622F95E436; Tue, 19 Aug 2025 13:40:21 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 19 Aug 2025 13:39:05 -0600 Message-ID: <20250819193918.874215-10-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250819193918.874215-1-sjg@u-boot.org> References: <20250819193918.874215-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: JWKDN3NXQ7ICK3PX7XCQUPPW764VZBZZ X-Message-ID-Hash: JWKDN3NXQ7ICK3PX7XCQUPPW764VZBZZ 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 09/15] dtoc: Add a test for the fdt_util.EnsureCompiled with indir 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 Provide a test which covers this feature of the EnsureCompiled() function. Signed-off-by: Simon Glass --- tools/dtoc/test/dtoc_test_inc.dts | 14 ++++++++++++++ tools/dtoc/test/test-include.dtsi | 5 +++++ tools/dtoc/test_fdt.py | 10 ++++++++++ 3 files changed, 29 insertions(+) create mode 100644 tools/dtoc/test/dtoc_test_inc.dts create mode 100644 tools/dtoc/test/test-include.dtsi diff --git a/tools/dtoc/test/dtoc_test_inc.dts b/tools/dtoc/test/dtoc_test_inc.dts new file mode 100644 index 00000000000..bf87fffb8fc --- /dev/null +++ b/tools/dtoc/test/dtoc_test_inc.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Test device tree file for dtoc + * + * Copyright 2017 Google, Inc + */ + +/dts-v1/; + +/ { +}; + +/include/ "test-include.dtsi" +#include "test-include.dtsi" diff --git a/tools/dtoc/test/test-include.dtsi b/tools/dtoc/test/test-include.dtsi new file mode 100644 index 00000000000..45b9da6dd0a --- /dev/null +++ b/tools/dtoc/test/test-include.dtsi @@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0+ +/ { + #address-cells = <1>; + #size-cells = <1>; +}; diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py index a0bed4e18bb..d66b7eb0f98 100755 --- a/tools/dtoc/test_fdt.py +++ b/tools/dtoc/test_fdt.py @@ -932,6 +932,16 @@ class TestFdtUtil(unittest.TestCase): finally: tools.outdir = old_outdir + def test_ensure_compiled_indir(self): + """Test compiling with input directories specified""" + tmpdir = tempfile.mkdtemp(prefix='test_fdt.') + dest = os.path.join(tmpdir, 'try.dts') + shutil.copy(find_dtb_file('dtoc_test_inc.dts'), dest) + + dtb = fdt_util.EnsureCompiled(dest, indir=['tools/dtoc/test']) + self.assertEqual(dtb, fdt_util.EnsureCompiled(dtb)) + shutil.rmtree(tmpdir) + def test_get_phandle_name_offset(self): val = fdt_util.GetPhandleNameOffset(self.node, 'missing') self.assertIsNone(val) From patchwork Tue Aug 19 19:39:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 33 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=1755632428; bh=Y5cVidJn+JZwn5hJ+yPOglp6dODG1PavlFxDrgZCIH4=; 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=OwKj/1xl5w3eQF/2rU8c9fSNS5dIsHbjGzU00Ll9dxPHFo3aVRnjKUnkfu1lT3zRP SxHwbTPKmUgfBHdesS9kTWlKsbAwC0iJfCYk3kHGFy6MJSUnhK1Js+7pJuYRqjiZbg mzmnBr30xc2gxYHW0cj61VpHldP/DLW8sb2ybQg1PxqEf/N7eHbVDX9mQ9AUsnmJws oBDacQ2ZIdSY/0h/2j9qMnA4J2+p0P5d4eZQYEBxzqmwMtEO+WfHj+TU2wRZpHgM2N 4+IRIsg3Wc5GQcPLvT2bLM5FPZMOzSlw4nYyYBjtaktByu3b1joiitYuLpAk9viAQQ 2khfYJyC2JHCA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id F19CF6761A for ; Tue, 19 Aug 2025 13:40:28 -0600 (MDT) 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 Dh3qPGzIUo88 for ; Tue, 19 Aug 2025 13:40:28 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632428; bh=Y5cVidJn+JZwn5hJ+yPOglp6dODG1PavlFxDrgZCIH4=; 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=OwKj/1xl5w3eQF/2rU8c9fSNS5dIsHbjGzU00Ll9dxPHFo3aVRnjKUnkfu1lT3zRP SxHwbTPKmUgfBHdesS9kTWlKsbAwC0iJfCYk3kHGFy6MJSUnhK1Js+7pJuYRqjiZbg mzmnBr30xc2gxYHW0cj61VpHldP/DLW8sb2ybQg1PxqEf/N7eHbVDX9mQ9AUsnmJws oBDacQ2ZIdSY/0h/2j9qMnA4J2+p0P5d4eZQYEBxzqmwMtEO+WfHj+TU2wRZpHgM2N 4+IRIsg3Wc5GQcPLvT2bLM5FPZMOzSlw4nYyYBjtaktByu3b1joiitYuLpAk9viAQQ 2khfYJyC2JHCA== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id E1CF967619 for ; Tue, 19 Aug 2025 13:40:28 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632427; bh=7BHMca+SZSzD3jmrxx1O0n2KxBO0KmZ1+0kgkMR1ekU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fLsFnBJzrPxUPLSDx2w/WC5+sO21+SSUMqYoRuTeVqPgZQUeEKgWYVb6dKNRCJJYM BS45NHtkYWqa/aEG1wp1pfgM4QWKAieHZe8gXYhhJIQB43gka7QFvJgiU2ETsllKk0 nLrkP98W6imC4YM7gDeavmnVF2u0cDS9RVQfXLt4f4GEYQhmxPcYf7FEB2yuOz0BQv DZZCOCkTdVyNGK2jiy4lQdDkrOcP5e+b8YIlMm4MykGVnWVCbtHzUdRGRMPmRX+cwX XN4aq58XWsfZydOLgXbp9lOds0dygndm6r/GiOSienjMwbNOUgPWqSbyZRVfwl/lQU HCg2wRfhRaIHw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 497AA6760D; Tue, 19 Aug 2025 13:40:27 -0600 (MDT) 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 Mz61a51NDke6; Tue, 19 Aug 2025 13:40:27 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632422; bh=Xn6hCyMv1xhq6VDtvxoNZTUGl9fb34isIG4YOsMw1C4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SdWZySHW/seCEKjZQaA/wiFYaVeQcCi2IeHS32VfI+ADHw5/m5h0ptahsqwQBItsv Rz7X/6Wa+9Oume2XKLp1EAvvK0lAF2JpIJrzlHtJtmmaCfDzRnwhyLcpE2jqtGPe+o npmeOK+R+m6SdsiuH7J8wJHeOoKjpATTlRm2Pex+mVriO7xvFtHQbYaVDnDU4XixL7 /FDW2AyYo050Jh9NRO4t2GSzmtYBtVJqSQjkI0zrJJL0O8joilHlftOjz/PHZatKHI 27mOYwdAot69+Uwr6qs3k8jcSS/HApD7qahvxTeGRttmIiSnElEt8QNFc7U7/Od3W3 TrDPs05UJgVGA== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 3D92F67627; Tue, 19 Aug 2025 13:40:22 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 19 Aug 2025 13:39:06 -0600 Message-ID: <20250819193918.874215-11-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250819193918.874215-1-sjg@u-boot.org> References: <20250819193918.874215-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: QLOFJ56C4JBXWRTRHY5BJ7GHODF445YO X-Message-ID-Hash: QLOFJ56C4JBXWRTRHY5BJ7GHODF445YO 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 10/15] test: Update test_fdt_add_pubkey() to use a separate dir 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 This test uses the same directory as the vboot tests, which means that they conflict when tests are run in parallel. Add a 'pk-' prefix to avoid this. Signed-off-by: Simon Glass --- test/py/tests/test_vboot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py index 06229db41dd..a2545ab3b60 100644 --- a/test/py/tests/test_vboot.py +++ b/test/py/tests/test_vboot.py @@ -634,7 +634,7 @@ def test_fdt_add_pubkey(ubman, name, sha_algo, padding, sign_options, algo_arg): # Check with fit_check_sign that FIT is signed with key utils.run_and_log(ubman, [fit_check_sign, '-f', fit, '-k', dtb]) - tmpdir = os.path.join(ubman.config.result_dir, name) + '/' + tmpdir = os.path.join(ubman.config.result_dir, f'pk-{name}') + '/' if not os.path.exists(tmpdir): os.mkdir(tmpdir) datadir = ubman.config.source_dir + '/test/py/tests/vboot/' From patchwork Tue Aug 19 19:39:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 34 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=1755632429; bh=D25xPlCZwTj6NdXqkI2yWOorWnzMsdp/OzHOqCB3Cx0=; 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=flnWhZVaHik319RAv+2gelBXjvSqstu56V+aZmYMfK2BHITyAaGKvUbSALSyIoV10 bNYOuy0wAElTIckQoTfEYVFlXVoHCmJyHtsg/kR904fu63GkdNf+zkzboRrZ4QjIqE xyb5qfxLGMmf75m/cbw2VrmQmFIVft87CBhUN/eNLSjqh9pdW0qYHpud7RKjksEuzZ MNTlVbmYey+YkOq9hvXoMNQGqBUbuulc9PBB/SDQ77Aj510zH8byokorMoZVmzcqSa 1Qg3UyrPF0qaMw+sh1qVfXwyFkkU14QPVrj1Zw+JxK+BqG11liXCN6vae1nu5AhAuj kEz921f+kOLjw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 55F346762A for ; Tue, 19 Aug 2025 13:40:29 -0600 (MDT) 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 U-U3Ygk-_-84 for ; Tue, 19 Aug 2025 13:40:29 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632429; bh=D25xPlCZwTj6NdXqkI2yWOorWnzMsdp/OzHOqCB3Cx0=; 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=flnWhZVaHik319RAv+2gelBXjvSqstu56V+aZmYMfK2BHITyAaGKvUbSALSyIoV10 bNYOuy0wAElTIckQoTfEYVFlXVoHCmJyHtsg/kR904fu63GkdNf+zkzboRrZ4QjIqE xyb5qfxLGMmf75m/cbw2VrmQmFIVft87CBhUN/eNLSjqh9pdW0qYHpud7RKjksEuzZ MNTlVbmYey+YkOq9hvXoMNQGqBUbuulc9PBB/SDQ77Aj510zH8byokorMoZVmzcqSa 1Qg3UyrPF0qaMw+sh1qVfXwyFkkU14QPVrj1Zw+JxK+BqG11liXCN6vae1nu5AhAuj kEz921f+kOLjw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 45B7D67619 for ; Tue, 19 Aug 2025 13:40:29 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632427; bh=xrrJ2QRD6UH7NHwdwhyLL1fGAhcmqW/aIXxqcl6559g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lCd2VQ4fm9AFS+aNdqQIv6eMrWh3/VRlE6u97LdHOBJ1P9ujPsUKFXuRkS7LMDXS5 vjeaSmmCyx9xKTBD8HGuN7wejpkURfRQ21Bkr1dtQ5GpiqpBExLXGqSsogyt87OXtJ ldEHPNpK8ohexc5o2qAKWGuc8RkE1vphHlk4PTDvdPnIvtQLhEt5kZtTn9N+FhO+RJ alJksirybQ5b1w2XCufllftU0BcaxpjR0BQ0aB488WKeKCKqvamIKtS/0L6eD+AZLP LCTGRkuN3Dkf1HihzB48yHKaJG+u3bDHexhVbXZUwF8ZhDqUM1PMU3GkohIxSxNq3W YzaFNmsxPyYpw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 4979167607; Tue, 19 Aug 2025 13:40:27 -0600 (MDT) 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 0qj-m_4vvNiM; Tue, 19 Aug 2025 13:40:27 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632423; bh=Gj1T579JOlVye7pXxIXE22T/zAp5ZEN44yB0MOUtfAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y17PQcGhYnceJwRvVo94rFZbJ0KVzerej7PKWOH0FEVyw/NmFncMSpovRFPrsXVye gGj1saX6pYANwAxhNNPqGjzsylJ18oKk73jYXCmj3x/aYOc3aylV8gUyVdOPUNhuJR D2ol/2sSXQAA3vNG6hvQBH/AA6G8j/k/Cp6/8v9+YZ3Kvs0MGSlndvioTjv4/oHAMp pvcqaftJUJIeoFfOcmqI6w+x1kMKGIZRPF35uWpjbHcptHnYEyXfW+9kV/hUAaStjo +rJAQIsnuwbV22QDTDngNLPzh8QAzSkxUvA5gke6XVz7ZakxCHg9jm975j75WBYPCL VDx+CCDb2EU4w== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 053916762A; Tue, 19 Aug 2025 13:40:22 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 19 Aug 2025 13:39:07 -0600 Message-ID: <20250819193918.874215-12-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250819193918.874215-1-sjg@u-boot.org> References: <20250819193918.874215-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: 2Q5EJEHAM6PM3W3M6HZTER3VYOO5ODLJ X-Message-ID-Hash: 2Q5EJEHAM6PM3W3M6HZTER3VYOO5ODLJ 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 11/15] test/run: Provide the full path to dtc 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 The current directory may be changed by a tool run from this script, so use an absolute path when setting the DTC variable. Signed-off-by: Simon Glass --- test/run | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/run b/test/run index 6352562e73e..b9a8eb1ea3f 100755 --- a/test/run +++ b/test/run @@ -75,12 +75,15 @@ if [ -z "$tools_only" ]; then echo "${prompt}" run_test "sandbox_flattree" ./test/py/test.py --bd sandbox_flattree \ ${para} --build -k "${ut_mark_expr}" +else + # Make sure sandbox_spl is built, as we need it from now on + ./test/py/test.py --bd sandbox_spl --build -k none fi # Set up a path to dtc (device-tree compiler) and libfdt.py, a library it # provides and which is built by the sandbox_spl config. Also set up the path # to tools build by the build. -DTC_DIR=build-sandbox_spl/scripts/dtc +DTC_DIR=$(pwd)/build-sandbox_spl/scripts/dtc export PYTHONPATH=${DTC_DIR}/pylibfdt export DTC=${DTC_DIR}/dtc TOOLS_DIR=build-sandbox_spl/tools From patchwork Tue Aug 19 19:39:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 35 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=1755632434; bh=mDv5ydAw0b/tyHt8zBKWyYE516gvhoVQ6TdRfB9RcyQ=; 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=S4mXWwggnfp4gMDohuVsuImBRk1D4sO85EJ6qQZ3z8ybErRrcrN50P5P/37FOBQyP DSF+HSkE++My6vqz4UVueQ4NC/f6SHkge+oWo0ONPy48LLN1ajibKUDc+d0VrTpc8/ eq+A7T5SMKSvYTpDcQJqQt3nlO+xHQigTYfIXuZBRAAQcm8JoJJXFu/DKm74IbeyJL DMAVH3BSqnH9jJ3j/jQsr3aIT31bvbqekbRws01GeIKMQg6J+jpzJoovLtp08q0XXO rq6mL/MtZw8KzSiVCZ/7Vbjz97FaQDvTk/JbG9B2jz7nZxSMyl4E/BfI/Cw79rVqpk 1ysIgB7cqzosQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 66C946761C for ; Tue, 19 Aug 2025 13:40:34 -0600 (MDT) 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 1Tl13KwGR4Zi for ; Tue, 19 Aug 2025 13:40:34 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632434; bh=mDv5ydAw0b/tyHt8zBKWyYE516gvhoVQ6TdRfB9RcyQ=; 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=S4mXWwggnfp4gMDohuVsuImBRk1D4sO85EJ6qQZ3z8ybErRrcrN50P5P/37FOBQyP DSF+HSkE++My6vqz4UVueQ4NC/f6SHkge+oWo0ONPy48LLN1ajibKUDc+d0VrTpc8/ eq+A7T5SMKSvYTpDcQJqQt3nlO+xHQigTYfIXuZBRAAQcm8JoJJXFu/DKm74IbeyJL DMAVH3BSqnH9jJ3j/jQsr3aIT31bvbqekbRws01GeIKMQg6J+jpzJoovLtp08q0XXO rq6mL/MtZw8KzSiVCZ/7Vbjz97FaQDvTk/JbG9B2jz7nZxSMyl4E/BfI/Cw79rVqpk 1ysIgB7cqzosQ== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 50DB467619 for ; Tue, 19 Aug 2025 13:40:34 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632431; bh=gANmfXkHKQjxHQmuolY8HpoF9SYvhQ1fdQyYUICUqxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eHTIINHNUlZYjSQSpJkUQyYvNoKsonG1BZh84VtuptIGWGEsC9ZgzhtCMYbd7itZ3 5Bfh0zGC5R4wyYQgiQxN6VoXPsnxGYHzY3WTItsgGKyueySc/SpDxQ0lf2byNg/oPN 8UB0jbBsILMAhtL0WYNCBeFvD1/QlvnX5oPUCZL1wcrmWcYboAOAxf1Ss0ViVlS7n8 wkHcRk2zY3jQaOSW4a9Adqc23AROrIR7VbAzjV7FWB9hVVwVa0cxLOXHFIQmjhDZEl FWWoU7uW/9Vin32WStfTog3Wj07qRWl+mmDRQtuAWN2cLjmK4E8SUW0NcgIxENUu8+ 7D+Mqms42eeGQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 9F53867607; Tue, 19 Aug 2025 13:40:31 -0600 (MDT) 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 QvfnX_66M4oX; Tue, 19 Aug 2025 13:40:31 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632427; bh=BlbLKtsLSWvRu0uYlwblyvRdmVH6okhbNb0OudyUwIM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PHWdNdhvcDmGXXmxshcOCkCZxjzfHwvyhFUwt65Tuatl8Eb1TeKSz7Gs2E0Nv5pz5 2rHmOCJvrh8N7fO/5wD/m8ubK6pa1+/qYmBneoYe/Yf6yotaSCoRLHH5bNhRgmBhuE eQNrfl7h1PArDEawVKUhE9S0otmoVPRrWVN4/MbeEDW16lfB75/spTHtlrWDSi3YES ZICYI3kcd6ysHrMALRZWiHWJEdVuD5jPzcFY51Vkrm2h+NzhuS0Ug+GFvWQSmtCXmT qQ6z01jvjbdnMv/z5iChytDbKCjIeuEBFGA8zmoK7gtE1+VC6rIPRy3mHi9YR31ek5 lX+KBalvXDa9w== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 7805667612; Tue, 19 Aug 2025 13:40:27 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 19 Aug 2025 13:39:08 -0600 Message-ID: <20250819193918.874215-13-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250819193918.874215-1-sjg@u-boot.org> References: <20250819193918.874215-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: GZFIDUJPIOW3URPVTAQUR2CLFKNRDNDR X-Message-ID-Hash: GZFIDUJPIOW3URPVTAQUR2CLFKNRDNDR 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 12/15] test/run: Skip xPL tests with make tcheck 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 The original purpose of 'make tcheck' was to run the tools and skip any pytests. This has been lost by the addition of sandbox_noinst and sandbox_vpl Restore the intended behaviour by skipping all tests with sandbox_spl (since it still needs to be built) and skipping the other builds entirely. Signed-off-by: Simon Glass --- test/run | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/test/run b/test/run index b9a8eb1ea3f..c48f08e0844 100755 --- a/test/run +++ b/test/run @@ -50,31 +50,33 @@ if [ -z "$tools_only" ]; then echo "${prompt}" run_test "sandbox" ./test/py/test.py --bd sandbox --build ${para} \ -k "${mark_expr}" -fi -# Run tests which require sandbox_spl -echo "${prompt}" -run_test "sandbox_spl" ./test/py/test.py --bd sandbox_spl --build ${para} \ + # Run tests which require sandbox_spl + echo "${prompt}" + run_test "sandbox_spl" ./test/py/test.py --bd sandbox_spl \ + --build ${para} \ -k 'test_ofplatdata or test_handoff or test_spl' -# Run the same tests with sandbox_noinst (i.e. without OF_PLATDATA_INST) -echo "${prompt}" -run_test "sandbox_noinst" ./test/py/test.py --bd sandbox_noinst --build ${para} \ + # Run the same tests with sandbox_noinst (i.e. without OF_PLATDATA_INST) + echo "${prompt}" + run_test "sandbox_noinst" ./test/py/test.py --bd sandbox_noinst \ + --build ${para} \ -k 'test_ofplatdata or test_handoff or test_spl' -# Run tests which require sandbox_vpl -echo "${prompt}" -run_test "sandbox_vpl" ./test/py/test.py --bd sandbox_vpl --build ${para} \ + # Run tests which require sandbox_vpl + echo "${prompt}" + run_test "sandbox_vpl" ./test/py/test.py --bd sandbox_vpl \ + --build ${para} \ -k 'vpl or test_spl' -if [ -z "$tools_only" ]; then # Run tests for the flat-device-tree version of sandbox. This is a special # build which does not enable CONFIG_OF_LIVE for the live device tree, so we can # check that functionality is the same. The standard sandbox build (above) uses # CONFIG_OF_LIVE. echo "${prompt}" run_test "sandbox_flattree" ./test/py/test.py --bd sandbox_flattree \ - ${para} --build -k "${ut_mark_expr}" + --build ${para} \ + -k "${ut_mark_expr}" else # Make sure sandbox_spl is built, as we need it from now on ./test/py/test.py --bd sandbox_spl --build -k none From patchwork Tue Aug 19 19:39:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 36 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=1755632436; bh=7iGBzJ5fcXHTv19wY6ZN4fDAX/aK0u2uRFeaIgIJUJw=; 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=niW5hFh+6jpVElUtqNcSJVZf0dEGFHb5sIwWY5ab/bOL/JFG/6FFAkWu5oNmo97GM ap6Ezb/0cv5sXR1BA4TWmcFAG44jHaxLxJNsabSJRPmiJlADF2LnmZvdyaUQW1Do7h HtogmfNZMA9IP1aG7IegbQGI/8IzUXIqmu4SFoAzw2Hv3DR+i4zZC3sMHOJmaEoi3t X8M5sooYTuA5N4Lv1XJzxKdFYUfysgbZW+6b2UEmhCt6o72MR0pmELREva2mHkpAR4 +9DKQu8fKIbxxir6gEdTJL9d9QMFpfBWnXQtGXMhVBUqpL3GboeFgcjRCBbY/fZR/3 WzA1CqQcAgblw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id DC6CC6762B for ; Tue, 19 Aug 2025 13:40:36 -0600 (MDT) 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 ZzHLoud7G6Th for ; Tue, 19 Aug 2025 13:40:36 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632436; bh=7iGBzJ5fcXHTv19wY6ZN4fDAX/aK0u2uRFeaIgIJUJw=; 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=niW5hFh+6jpVElUtqNcSJVZf0dEGFHb5sIwWY5ab/bOL/JFG/6FFAkWu5oNmo97GM ap6Ezb/0cv5sXR1BA4TWmcFAG44jHaxLxJNsabSJRPmiJlADF2LnmZvdyaUQW1Do7h HtogmfNZMA9IP1aG7IegbQGI/8IzUXIqmu4SFoAzw2Hv3DR+i4zZC3sMHOJmaEoi3t X8M5sooYTuA5N4Lv1XJzxKdFYUfysgbZW+6b2UEmhCt6o72MR0pmELREva2mHkpAR4 +9DKQu8fKIbxxir6gEdTJL9d9QMFpfBWnXQtGXMhVBUqpL3GboeFgcjRCBbY/fZR/3 WzA1CqQcAgblw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id B52C867607 for ; Tue, 19 Aug 2025 13:40:36 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632433; bh=6CRoJ0VyhUuZpzd4UftCzpakUKh4iUpzL2qzL4t5lt8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P/s3Jxgj8ZCj/0+k+yD9JGFnTIhXejiOTcTBlGsA9vlJuaW6Kxvrf4Bd6P6nVu7Dl KsWl5WAO0F4xLLdmfPhNvqHUtBHxghipDwWWwGmSyGMC/q0ixcdgUNWYkRzq27Wxrt pMy6w+LOx3/TVD1Al1aYqjBzyxoDCc7C6msRnJNSsO18OeLVOBydeqUB3xHUSCoJdr VHoq6mJoLUVYzz38lvymyLpQ3zp3I8UV48kt7lCCDu/vWZYEZvT30Jcs0d2mepidec ARabuoijyDBIlnTVbdCc8rdTidoOhtvrcyMAW20Wpo/RxfujMBduYOMqJykVLoy3SD iUPUowuLA+3gA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id BEDE067607; Tue, 19 Aug 2025 13:40:33 -0600 (MDT) 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 20jX6AwDzPoK; Tue, 19 Aug 2025 13:40:33 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632432; bh=Nnv8A8dgRaTQWFgoyEoi/9P6BsAIsTH/pssfBRGag4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IPXLYtUB/1P7B/F87w+6fDUrSJd7x5HWzlnpfwh5d4zPCGUlZba+wxIaIkc+q4aZi FMc06HssctfYZ7PIwPTakoQr8WwZd74YT8iFjRJedPztSTbV/+kPovROYWMkCN82IX 9IpwdMOW5LMQhhUrrgXowG6mCMFffMWHzYvYbbNNasDTimeVp5KHJx9B1VmytMYJDh K83miqw0cUeLvIwD2v34qpbPKXYgbuopywX5a7N/KwSVbTK2UlyU8Lr3YQsBwhkrZD PD+RziGl7C20OavjmGKximPAWPTcaJqozHTNcHclfzZrNKeabmdye/3rGBp6VmFqCB 6/iC/9HbDwyAw== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id E208F6760D; Tue, 19 Aug 2025 13:40:31 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 19 Aug 2025 13:39:09 -0600 Message-ID: <20250819193918.874215-14-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250819193918.874215-1-sjg@u-boot.org> References: <20250819193918.874215-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: NNUUH5RQKBCJO63Y4MVB7HMKRNH2N25A X-Message-ID-Hash: NNUUH5RQKBCJO63Y4MVB7HMKRNH2N25A 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 13/15] test/run: Run more quietly 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 Pytest shows about 10 lines of output of limited merit at the top. Use the -q flag to request that it doesn't so that the actionable things are more visible. Signed-off-by: Simon Glass --- test/run | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/run b/test/run index c48f08e0844..1f60fc8fb61 100755 --- a/test/run +++ b/test/run @@ -13,6 +13,8 @@ run_test() { [ $? -ne 0 ] && failures=$((failures+1)) } +quiet=-q + # Clean up things the Makefile created unset MAKE MAKEFLAGS MAKELEVEL MAKEOVERRIDES MAKE_TERMERR MAKE_TERMOUT @@ -49,24 +51,24 @@ if [ -z "$tools_only" ]; then # Run all tests that the standard sandbox build can support echo "${prompt}" run_test "sandbox" ./test/py/test.py --bd sandbox --build ${para} \ - -k "${mark_expr}" + ${quiet} -k "${mark_expr}" # Run tests which require sandbox_spl echo "${prompt}" run_test "sandbox_spl" ./test/py/test.py --bd sandbox_spl \ - --build ${para} \ + --build ${para} ${quiet} \ -k 'test_ofplatdata or test_handoff or test_spl' # Run the same tests with sandbox_noinst (i.e. without OF_PLATDATA_INST) echo "${prompt}" run_test "sandbox_noinst" ./test/py/test.py --bd sandbox_noinst \ - --build ${para} \ + --build ${para} ${quiet} \ -k 'test_ofplatdata or test_handoff or test_spl' # Run tests which require sandbox_vpl echo "${prompt}" run_test "sandbox_vpl" ./test/py/test.py --bd sandbox_vpl \ - --build ${para} \ + --build ${para} ${quiet} \ -k 'vpl or test_spl' # Run tests for the flat-device-tree version of sandbox. This is a special @@ -75,7 +77,7 @@ if [ -z "$tools_only" ]; then # CONFIG_OF_LIVE. echo "${prompt}" run_test "sandbox_flattree" ./test/py/test.py --bd sandbox_flattree \ - --build ${para} \ + --build ${para} ${quiet} \ -k "${ut_mark_expr}" else # Make sure sandbox_spl is built, as we need it from now on From patchwork Tue Aug 19 19:39:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 37 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=1755632440; bh=zr5AG9c4mSGEI28cYtq2M13rOESuyfZXcIVImDOVQzE=; 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=T/Th8t1qp8G2+O+2RoFH8IVytW0XLx1y3kfepHZ8SCoWjFO0KsHVv+zJTTNv2E3y/ MBBe7bYX5Kbq5tUHswEZciyMXNbV5wBdmKVfEnHRQhUC0r6nwr/eBWSaqRLfI8bJrR uh6oNHdIh8OJJQIaC9DvUa4AWP8QO3eL/A3dMbDcl5SsGbfLypjSEjPgGOqZalvwbg tkgdQQ7iJCJLCsE370WpQAGNuJeBnT9a2gLIUiVxSgVPAna6zHsXfPoS2Vq7I01UO9 x22jj0dn3P4M2JKv1tSJNiaYlFTIS4ITNkVJz9PxCElZt6uAHjDeFT6E2kLTZVUoyX 1YGgrnx916P9A== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 2F16E67612 for ; Tue, 19 Aug 2025 13:40:40 -0600 (MDT) 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 fQpjNP5G6aNm for ; Tue, 19 Aug 2025 13:40:40 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632440; bh=zr5AG9c4mSGEI28cYtq2M13rOESuyfZXcIVImDOVQzE=; 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=T/Th8t1qp8G2+O+2RoFH8IVytW0XLx1y3kfepHZ8SCoWjFO0KsHVv+zJTTNv2E3y/ MBBe7bYX5Kbq5tUHswEZciyMXNbV5wBdmKVfEnHRQhUC0r6nwr/eBWSaqRLfI8bJrR uh6oNHdIh8OJJQIaC9DvUa4AWP8QO3eL/A3dMbDcl5SsGbfLypjSEjPgGOqZalvwbg tkgdQQ7iJCJLCsE370WpQAGNuJeBnT9a2gLIUiVxSgVPAna6zHsXfPoS2Vq7I01UO9 x22jj0dn3P4M2JKv1tSJNiaYlFTIS4ITNkVJz9PxCElZt6uAHjDeFT6E2kLTZVUoyX 1YGgrnx916P9A== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 1A891675EE for ; Tue, 19 Aug 2025 13:40:40 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632439; bh=fYe98cNXtdgxti9VO+9zctYfsInz19hv5DnuxzIH1nA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oQhfcXmemGYczQq4/0sPP9ijC25YbnNIvGfLk0EbitvyjOzKbVYHVz5tTJbki1zzK qbcUqD8Uvl1rrzKYdxE9/PYJXSA9YhW5j/dGlwJRpRrj6L0jZISk+1mhfQTM8LlQ+z xReOZYVHXPBkrgg4lt+g5IGubgbUE3EOYAnyyIzHbNgY2E/Zhqzn/hJlCCnOHQEIqF dweOOv5ldQo8FAzFtuxp9OdOegAQxRjmorpOx5EfRc56WiGiUZImuXGa7U8y59/zVc BJoVDTARx74jLIFOprxjlQMri6t7dnsauEB3svy0p49EkWMpN5QBCaT9zwwZRQCRjE p3ODXhzw/ILSw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 3E92A5E436; Tue, 19 Aug 2025 13:40:39 -0600 (MDT) 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 1sPqlz7w87E2; Tue, 19 Aug 2025 13:40:39 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632434; bh=+0M9Bfw/HHN3g5IYOP6HeQyZ0Fu+Pgw7xKJc8gic7+w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fw3FYLLC0miRjFBDtBQmDLb8JzKEcYl4Wgxhrb8k0T2//pcKK+siAIbOX+p2LFl4w PB55xr5Pn1BOnlVfCt8jBneAmJ/FvYHDhK0QRYK7Ket6ePyDnpLuAFxHOJxX/SSzxN M59SymqXCoNwwR+pQozcTC0grNCOMY9swKcsVThlnIBKvqIFen7Tv/rdzK8LTZNLnB FlqylvOHmJRJsW1m1ZKuZhcSukyY4XXzhPnmWQBB0MTIvgLc8e/bIVXfw/NwyCRvgH vHWHuDm0Z5QimccqBVlJdauuehkm92xTCRLDhkyf0z+hpe5WNRIBSAWAtV8DQLVCSw haqAAkC0e86Jw== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 15AC06760D; Tue, 19 Aug 2025 13:40:34 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 19 Aug 2025 13:39:10 -0600 Message-ID: <20250819193918.874215-15-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250819193918.874215-1-sjg@u-boot.org> References: <20250819193918.874215-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: SMJ3AVSWNUIDLS3H7Z3MCDZQQ4O2VVNL X-Message-ID-Hash: SMJ3AVSWNUIDLS3H7Z3MCDZQQ4O2VVNL 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 14/15] test/run: Tidy up the tool path for binman 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 Binman needs access to tools like mkimage and cbfstool to run all the tests. Set up the TOOLS_DIR earlier and allow use of a TOOLS_DIR environment variable to specify where the tools are. This can be used from CI, for example. Signed-off-by: Simon Glass --- test/run | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/run b/test/run index 1f60fc8fb61..f6d39989fb8 100755 --- a/test/run +++ b/test/run @@ -90,9 +90,12 @@ fi DTC_DIR=$(pwd)/build-sandbox_spl/scripts/dtc export PYTHONPATH=${DTC_DIR}/pylibfdt export DTC=${DTC_DIR}/dtc -TOOLS_DIR=build-sandbox_spl/tools +TOOLS_DIR=$(pwd)/build-sandbox_spl/tools -run_test "binman" ./tools/binman/binman --toolpath ${TOOLS_DIR} test +# TOOLPATH may be defined to provide mkimage, cbfstool, etc. +export PATH=$PATH:${TOOLS_DIR} + +run_test "binman" ./tools/binman/binman ${TOOLPATH} test run_test "patman" ./tools/patman/patman test run_test "u_boot_pylib" ./tools/u_boot_pylib/u_boot_pylib @@ -106,8 +109,7 @@ run_test "dtoc" ./tools/dtoc/dtoc -t # Code-coverage tests cannot run in parallel, so skip them in that case if [ -z "${para}" ]; then - export PATH=$PATH:${TOOLS_DIR} - run_test "binman code coverage" ./tools/binman/binman test -T + run_test "binman code coverage" ./tools/binman/binman ${TOOLPATH} test -T run_test "dtoc code coverage" ./tools/dtoc/dtoc -T run_test "fdt code coverage" ./tools/dtoc/test_fdt -T fi From patchwork Tue Aug 19 19:39:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 38 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=1755632442; bh=PQub/rEtDYgYqBdxWJCP3BbR446mnOKgQAaFfmJnsJQ=; 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=bo1j0NKnY4zwovQtx+Fbq2jB0NnnkZQAnSnsdysoSVz38kCqkmQWcLCzXJexfd+Aj 1lGCMu1B0eFpB2aPHzvU16e9FPgemx2QjFIKuMmfHDOeh2n2A0tnvZhu2GqWlnaznN LjEkt9zHJi2CyQoqWtpU8sesTdX+nHSkGCpZ1BfD1Ij5hbLiha/8HMxwCxpObVQidu dnK6IxChSZ33Fiv9vy6OHoMFrRbTdk/eu8Zz1wq9o9FWOzanRzYU4MJtTsy9hdZcee mN8nntmi0KNLxt9gnN7qOEhA3Ix7CCR/estDn1djMTvGbe57i89VYd36n+dfASJPAI DU38vCwbFsMUg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 71D1F675F4 for ; Tue, 19 Aug 2025 13:40:42 -0600 (MDT) 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 d2JZviYWAKXr for ; Tue, 19 Aug 2025 13:40:42 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632440; bh=PQub/rEtDYgYqBdxWJCP3BbR446mnOKgQAaFfmJnsJQ=; 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=OP3WxZfqoF1JoELszQ6pCsF2qsZ6t7fl68ZJX8pOolqVTRjJ3QbLcbGbA3wNVShaP ESfbQD/K8u3lm37B5u1Cq5YE3JkphNmF56y1eNKiKKpp7NOdAe7JFgqaLV/OR90Zvj HpFwYIps/ISEj+q59FHmKLvLwe+jn5LIzurB8qoxQMo8QhI/PVka0Zhx5hPYa8Rbwr qsrnLM3q9mY1VZhnBX+kHRLgbuogIiEmnhDBzNMi8qVXS5LDAWNsy8Q4lzb6/6QFoc A9B0WJglnRMnWbO5RCwWzqO0I9aD3lN9mwUCSzK1O1zr8d0hRRRSxllUcQPofICQ8K MMgSTRM8h2vmg== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 69B74675EE for ; Tue, 19 Aug 2025 13:40:40 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632439; bh=4VZBcTxDUX/Ch12tZ1KD83V22QYTLdXCU9cd4MlMQ+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ig9zaExwMaI+tI+hv8rIE7MvhycGdPJmfIyAqEeon7GRLSrpDD+FNxkd081/OvESP DSYz72lh5FLyezNVAo8BsIXOcr7s+/4bMO/UU/nN9mRokB6BXk+oJgFB8kFGaMCfIV 8zfUdZcK3Fs/HlEYCnwakgO+8sF+caKp3GlPAUrBalEmA0qguBdGR68j4IGoM7L3ca 1fVRoVvM7eOJLqG1nQROjARVaA0NyqUjWcoPmiVUZyePQsDu9jQYHxVKiQGbOeDCJT L8VQZCOaLXqcBPXpc7zFAmWsIeY96YKi+mP9fhkzgH5i75mv17yMXTdoCAm/kK9Bmc B98zK7SQKNA1w== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 571CC675EE; Tue, 19 Aug 2025 13:40:39 -0600 (MDT) 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 kfAct8dFi3LU; Tue, 19 Aug 2025 13:40:39 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755632435; bh=crtL5Ov5m1bbApF0GwuygAlDaZ9YCGEt5Z+Sw9KQFpQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SWl0KvdAxVU1jmpJZuRE7oeaDNQXlYvB5Lt5hfyK0ZaGW72IzENHj//i8Qy0L4z6S javSxdUJdszm4qI1fCIp2GJW6Kh5uT2rjupsl3bEGCr6WkWgFIQLoDI0yPeBFeZaUQ YTUjuJ+GbAYhSpLxq/Fzg7XN08atDSN78GlCZCPckEH8h6+dUhyqr8WebOJbbU5GSi 7upKn3jNtzsEPaxjCjRo6FTf024jD7s/jT6bdd2f5t1GwYy9WeBeQGL5kyCTRZEJ2X iD+vVlU8PBXLLK8UYAbC8kjZt/pedjDQTozuAFIdQA8Mk8D0hmnu8muget9K8oXF9j tvqrRYx56ICWQ== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id F1EEB67612; Tue, 19 Aug 2025 13:40:34 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Tue, 19 Aug 2025 13:39:11 -0600 Message-ID: <20250819193918.874215-16-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250819193918.874215-1-sjg@u-boot.org> References: <20250819193918.874215-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: ULG3V7KUVSO7S4EQSB5EU7LGY7SB4RBX X-Message-ID-Hash: ULG3V7KUVSO7S4EQSB5EU7LGY7SB4RBX 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 15/15] CI: Check that make check et al work correctly 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 Add these to CI so that we can keep them running more easily. Sadly the 'make check' takes about 10mins to run, so put these in the test.py stage, where there are other slow tests. Unfortunately 'make pcheck' doesn't work in CI: https://concept.u-boot.org/u-boot/u-boot/-/jobs/115074 The problem may be due to a race between image-creation and testing using those images. Further work is needed to improve handling of fixtures when running tests in parallel. Signed-off-by: Simon Glass --- .gitlab-ci.yml | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8dbf1970a2..642f3483fc2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -336,6 +336,53 @@ Check packing of Python tools: script: - make pip +# Template for running the 'make check' tools +.python_check_template: + stage: test.py + rules: + - if: $LAB_ONLY == "1" + when: never + - if: $TEST_SUITES == "1" + when: always + - when: never + before_script: + - git config --global user.name "GitLab CI Runner"; + git config --global user.email trini@konsulko.com; + git config --global --add safe.directory "${CI_PROJECT_DIR}"; + export USER=gitlab; + python3 -m venv /tmp/venv; + . /tmp/venv/bin/activate; + pip install -r test/py/requirements.txt -r tools/binman/requirements.txt + -r tools/buildman/requirements.txt -r tools/patman/requirements.txt + -r tools/u_boot_pylib/requirements.txt; + export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only; + export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; + export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"; + # Set environment variables + - export TOOLPATH="--toolpath ${pwd}/build-sandbox/tools --toolpath /opt/coreboot" + - export PATH=/opt/qemu/bin:${PATH} + +Check make check: + extends: .python_check_template + script: + - make check + +Check make qcheck: + extends: .python_check_template + script: + - make qcheck + +Check make tcheck: + extends: .python_check_template + script: + - make tcheck + +# This currently fails, so disable it +#Check make pcheck: +# extends: .python_check_template +# script: +# - make pcheck + # Test sandbox with test.py sandbox test.py: variables: