From patchwork Tue Jan 6 14:28:22 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1298 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=1767709800; bh=n2L494J3JLlFYhviWad2emb51W0KH9Li8NjAz+lxnSg=; 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=qHOSN4Q2n/QpVrpvNgWUwO+fBy16hGwKyZF49Q+cmHvRPWg/sh8+8Kh8xD46wx0ff I+v6/Vgtza2Ic/vqS8dk0dv8QacOn/GdgpXA89Gym0e8Vt6tDqMidYMJuKGe6H13Yr 2B1Mwv6uFJaMa9t1JEE1FGb43K4jz3AlyGxz3eMt6Ly5EYuf8QIYbyfKb1bj6/RBv2 4/ea4hcxMEXY0Pb10isx1LRlmJYnmXt7RF3rYhLJckrdutNqHrNxHUc5PavlNAnsTn AfnaBdMPiVxO3waZuXejqoAgJM2LCp4Lhl/p0nHsai66dvN6EeVYJlfZjNSq4eyO0q N/XlBK6PhcEDA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 877A869054 for ; Tue, 6 Jan 2026 07:30:00 -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 1Srf5ZHHXVFj for ; Tue, 6 Jan 2026 07:30:00 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1767709800; bh=n2L494J3JLlFYhviWad2emb51W0KH9Li8NjAz+lxnSg=; 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=qHOSN4Q2n/QpVrpvNgWUwO+fBy16hGwKyZF49Q+cmHvRPWg/sh8+8Kh8xD46wx0ff I+v6/Vgtza2Ic/vqS8dk0dv8QacOn/GdgpXA89Gym0e8Vt6tDqMidYMJuKGe6H13Yr 2B1Mwv6uFJaMa9t1JEE1FGb43K4jz3AlyGxz3eMt6Ly5EYuf8QIYbyfKb1bj6/RBv2 4/ea4hcxMEXY0Pb10isx1LRlmJYnmXt7RF3rYhLJckrdutNqHrNxHUc5PavlNAnsTn AfnaBdMPiVxO3waZuXejqoAgJM2LCp4Lhl/p0nHsai66dvN6EeVYJlfZjNSq4eyO0q N/XlBK6PhcEDA== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 76BDB69118 for ; Tue, 6 Jan 2026 07:30:00 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1767709798; bh=sUR1Bt7FvZDxD39AdzDRd19ge0ie/4PtXTL3gJ5D0Kw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xev+JyFP64vAw6cOzqwhegVl8F8DeJ/2r+mGiy+YJj5dviFeis36FkN5N6ZEbznyw UfZdFM9/7VZQMeL3ztwBH363eMh6zRTTXHclS+w3FHB31fmEVb2nA4uSLdILkXi5nH 5d3YHjOkW2gPJJKlDqW3HJcMzjXGGwHeWBQbatdu5bV5gMpbD+KbTqgA0AG+7I+Z6P IfMfSFhWTq0S8yAV3T6AxZ3iD+V/LZv+pQ1Q8zpdl6hzM5ySeB2LJtgwXJRLND1TUE 5JLGumOolS1lpLg3iIjixyrnO1ffdIuNhId1tirmAfwbENVGcyI5rbVSrbEW7EPeU0 9cbtNdPwgRGLw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 7DF2F69054; Tue, 6 Jan 2026 07:29:58 -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 DcX_NHQDYg-o; Tue, 6 Jan 2026 07:29:58 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1767709794; bh=3nLT0r/LbSnVWVU4hR8+mrJGQC5pzzE1FsJc7807D8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cuQ1m/rzrFf8qoEVx1C8kiCBvu774oiTLz+HlmIlJMkLWsHLbL2mFaj0Ym+cYHMF+ ak4Nvj9WI0EmnuL0qgVYy77uGsMfkMndDgD7r0dXTFDaQ20/3tMIAXWSolDCqw7eOv ngUretR55+A2rvbj7KIvsv4icPyIzalFjEva4FMRNEQvjZSDKpa/jsI1Ev/bCVehRb bjasg/gzaD2PWHKeM1T+0awyGRoXd+OPx//TBGY1v/XfMuQmn57yQwQXO6szaF9aWA Q9IZVbC19P+tIdatRhjmDnyoOGsh44RhP8h9z80ppymKOCz+51f27NO9Nnoqh+/v+k GtoZ9IhF3Arig== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id E68D469118; Tue, 6 Jan 2026 07:29:53 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Tue, 6 Jan 2026 07:28:22 -0700 Message-ID: <20260106142834.2511220-18-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260106142834.2511220-1-sjg@u-boot.org> References: <20260106142834.2511220-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: NCNWFLV5E5AIEOP3GS747NUBXU7Q2FAL X-Message-ID-Hash: NCNWFLV5E5AIEOP3GS747NUBXU7Q2FAL 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 17/22] buildman: Shorten long lines in test.py 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 Shorten test-data strings and reformat code to reduce line lengths. Two lines in errors[4] remain over 80 chars since changing them breaks the output-comparison tests. Co-developed-by: Claude Signed-off-by: Simon Glass --- tools/buildman/test.py | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/tools/buildman/test.py b/tools/buildman/test.py index 588044fe20c..d5d55277ee0 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -73,7 +73,7 @@ main.c:260:6: warning: unused variable 'joe' [-Wunused-variable] ''', '''main.c: In function 'main_loop2': main.c:295:2: error: 'fred' undeclared (first use in this function) -main.c:295:2: note: each undeclared identifier is reported only once for each function it appears in +main.c:295:2: note: each undeclared identifier is reported only once make[1]: *** [main.o] Error 1 make: *** [common/libcommon.o] Error 2 Make failed @@ -84,25 +84,27 @@ without "ranges" or child "reg" property ''', '''powerpc-linux-ld: warning: dot moved backwards before `.bss' powerpc-linux-ld: warning: dot moved backwards before `.bss' -powerpc-linux-ld: u-boot: section .text lma 0xfffc0000 overlaps previous sections -powerpc-linux-ld: u-boot: section .rodata lma 0xfffef3ec overlaps previous sections -powerpc-linux-ld: u-boot: section .reloc lma 0xffffa400 overlaps previous sections -powerpc-linux-ld: u-boot: section .data lma 0xffffcd38 overlaps previous sections -powerpc-linux-ld: u-boot: section .u_boot_cmd lma 0xffffeb40 overlaps previous sections -powerpc-linux-ld: u-boot: section .bootpg lma 0xfffff198 overlaps previous sections +powerpc-linux-ld: u-boot: section .text lma 0xfffc0000 overlaps previous +powerpc-linux-ld: u-boot: section .rodata lma 0xfffef3ec overlaps previous +powerpc-linux-ld: u-boot: section .reloc lma 0xffffa400 overlaps previous +powerpc-linux-ld: u-boot: section .data lma 0xffffcd38 overlaps previous +powerpc-linux-ld: u-boot: section .u_boot_cmd lma 0xffffeb40 overlaps previous +powerpc-linux-ld: u-boot: section .bootpg lma 0xfffff198 overlaps previous ''', '''In file included from %(basedir)sarch/sandbox/cpu/cpu.c:9:0: -%(basedir)sarch/sandbox/include/asm/state.h:44:0: warning: "xxxx" redefined [enabled by default] -%(basedir)sarch/sandbox/include/asm/state.h:43:0: note: this is the location of the previous definition +%(basedir)sarch/sandbox/include/asm/state.h:44:0: warning: "xxxx" redefined +%(basedir)sarch/sandbox/include/asm/state.h:43:0: note: this is the location \ +of the previous definition %(basedir)sarch/sandbox/cpu/cpu.c: In function 'do_reset': %(basedir)sarch/sandbox/cpu/cpu.c:27:1: error: unknown type name 'blah' -%(basedir)sarch/sandbox/cpu/cpu.c:28:12: error: expected declaration specifiers or '...' before numeric constant +%(basedir)sarch/sandbox/cpu/cpu.c:28:12: error: expected specifiers before num make[2]: *** [arch/sandbox/cpu/cpu.o] Error 1 make[1]: *** [arch/sandbox/cpu] Error 2 make[1]: *** Waiting for unfinished jobs.... In file included from %(basedir)scommon/board_f.c:55:0: -%(basedir)sarch/sandbox/include/asm/state.h:44:0: warning: "xxxx" redefined [enabled by default] -%(basedir)sarch/sandbox/include/asm/state.h:43:0: note: this is the location of the previous definition +%(basedir)sarch/sandbox/include/asm/state.h:44:0: warning: "xxxx" redefined +%(basedir)sarch/sandbox/include/asm/state.h:43:0: note: this is the location \ +of the previous definition make: *** [sub-make] Error 2 ''' ] @@ -121,11 +123,11 @@ COMMITS = [ ] BOARDS = [ - ['Active', 'arm', 'armv7', '', 'Tester', 'ARM Board 1', 'board0', ''], + ['Active', 'arm', 'armv7', '', 'Tester', 'ARM Board 1', 'board0', ''], ['Active', 'arm', 'armv7', '', 'Tester', 'ARM Board 2', 'board1', ''], - ['Active', 'powerpc', 'powerpc', '', 'Tester', 'PowerPC board 1', 'board2', ''], - ['Active', 'powerpc', 'mpc83xx', '', 'Tester', 'PowerPC board 2', 'board3', ''], - ['Active', 'sandbox', 'sandbox', '', 'Tester', 'Sandbox board', 'board4', ''], + ['Active', 'powerpc', 'powerpc', '', 'Tester', 'PowerPC 1', 'board2', ''], + ['Active', 'powerpc', 'mpc83xx', '', 'Tester', 'PowerPC 2', 'board3', ''], + ['Active', 'sandbox', 'sandbox', '', 'Tester', 'Sandbox', 'board4', ''], ] BASE_DIR = 'base' @@ -430,8 +432,8 @@ class TestBuild(unittest.TestCase): if filter_migration_warnings: self.assert_summary(next(lines).text, 'sandbox', '+', ['board4']) else: - self.assert_summary(next(lines).text, 'arm', '', ['board0', 'board1'], - outcome=OUTCOME_OK) + self.assert_summary(next(lines).text, 'arm', '', + ['board0', 'board1'], outcome=OUTCOME_OK) self.assert_summary(next(lines).text, 'powerpc', '', ['board2', 'board3'], outcome=OUTCOME_OK) self.assert_summary(next(lines).text, 'sandbox', '+', ['board4']) @@ -848,7 +850,8 @@ class TestBuild(unittest.TestCase): # Check failure to add CONFIG value result = cfgutil.check_cfg_lines([], {'MARY':'MARY="mary"'}) self.assertEqual([ - ['MARY="mary"', 'Missing expected line: CONFIG_MARY="mary"']], result) + ['MARY="mary"', 'Missing expected line: CONFIG_MARY="mary"']], + result) def get_procs(self): """Get list of running process IDs from the running file"""