From patchwork Sat Dec 27 20:43: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: 1085 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=1766868267; bh=5JjtC0Cy9gS42leZ2BFLMGCTDP1tB/Yn+J1+xrMyoVI=; 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=d5qfcXjwPOku0W44tUoIvJMbVC3O2tGDhhl1FiLmhz4FNsG01TmDT45X7qjVhUp0d xW3YJmIIc8L4dPcxsiJcjWstcOhEKkRQhoBIoqhz4W+hsMPTpq+2SO8aYPnszbfzJL Gx/MkjeUdAWlO7yk/DT0aWW6bZCIZeLSbhnRvZWRonF1ADXwJoSTTcSviXpuHA5MHI UBMPKOWerFz1uSQEuaJ7WuXwXnmKln0NPBjrPIuDg2nlMSEzRpV9E78KYOMlOiLfCC OIzhgM+4cbi/RygeHB+Swb+PYlEwL4fK6uAVdfs1PjjAIM1k8r624sL8vnwY75sfU6 KMWcfidmmeWUA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id B43B165079 for ; Sat, 27 Dec 2025 13:44:27 -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 0kKDBEaQLgfK for ; Sat, 27 Dec 2025 13:44:27 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1766868267; bh=5JjtC0Cy9gS42leZ2BFLMGCTDP1tB/Yn+J1+xrMyoVI=; 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=d5qfcXjwPOku0W44tUoIvJMbVC3O2tGDhhl1FiLmhz4FNsG01TmDT45X7qjVhUp0d xW3YJmIIc8L4dPcxsiJcjWstcOhEKkRQhoBIoqhz4W+hsMPTpq+2SO8aYPnszbfzJL Gx/MkjeUdAWlO7yk/DT0aWW6bZCIZeLSbhnRvZWRonF1ADXwJoSTTcSviXpuHA5MHI UBMPKOWerFz1uSQEuaJ7WuXwXnmKln0NPBjrPIuDg2nlMSEzRpV9E78KYOMlOiLfCC OIzhgM+4cbi/RygeHB+Swb+PYlEwL4fK6uAVdfs1PjjAIM1k8r624sL8vnwY75sfU6 KMWcfidmmeWUA== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id A3FA264E49 for ; Sat, 27 Dec 2025 13:44:27 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1766868265; bh=+tI1FaPizd24NB55/FrxoqEyoR1RlkY9JVhZvNvzeM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z2bqW9Dq8kGYyAY/6FaWjSzcGT/iR3Uqk5yErKRrL8YrmzByVDMmsqHHEr5DNOrJV JDnqqyQTtqKWPYstKhS9IE3m8M2dwJe+b+2o36AkBiY9pgiBNok9sVbtPYvA/x1ozD QW2tgBSDnet2xMsqOq++JD2BwxoH0y5ng0Zzi6/0WMIQwqHY8qprMjcEN8W+141iox WQxiofXZNMBMvaU65JvmGMnp3DzrGPeUWhJDwy4D+Wp2yvsWaPMif2/y/fhXEDgtnN iaMS8zwKs9sMekPakNqJEADIEeJHjRv7cEPxeCiROilkFRSpb6pbSlKX0KXSlQ7hWh 6DQbWKNa94cpA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id A010F64E42; Sat, 27 Dec 2025 13:44:25 -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 18X6-CVADTXI; Sat, 27 Dec 2025 13:44:25 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1766868260; bh=fAZOwTR2zJJV/Z/udmDhoShoGRGMG/TpSwPDiimN1Fo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s4XTpUr2N6eRDxMMw/k8/RbFzPLBDxb0TC462GBFtEXutCffo4Z/7eKoNgfeFic/I JeLUucgRHAwF8ucYyPzOfPjwBJ1uIdIxBuMvFfwZCHzB8/R/17JK9rO/B5bNcFLWBx erlkhjuPOPmTk2HQos/g5ME71uLdBifNnRcIBQf5B3/rrLc/DADMJOuB/pfdRBmuvv LopfNjsPjKfdbVYCTRLyahyRLwLJRS6zcTipbkkH6L4vlU6WYQgUbGUpoE8hOFPqEI OK9P7SepzDLrG2yt1+SxUB6fb4mW9OmoKozivYV1qC4CAfSmGNAseHuf6at1BDJAIO 7wHWbGc0/3mTA== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 0CD5A64C0C; Sat, 27 Dec 2025 13:44:19 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Sat, 27 Dec 2025 13:43:03 -0700 Message-ID: <20251227204318.886983-9-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251227204318.886983-1-sjg@u-boot.org> References: <20251227204318.886983-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: DACWPBAFEZLU4TMMSIUMMIUXAGWUMSLZ X-Message-ID-Hash: DACWPBAFEZLU4TMMSIUMMIUXAGWUMSLZ 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: Heinrich Schuchardt , Simon Glass , Claude X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 08/16] test: ext4l: Handle variable console output in tests 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 Directory entries appear in hash order and mount messages may appear multiple times during probe operations. Update tests to skip remaining output after finding expected content. We could perhaps refine this with more powerful matching, but that is left for another day. Co-developed-by: Claude Signed-off-by: Simon Glass --- test/fs/ext4l.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/test/fs/ext4l.c b/test/fs/ext4l.c index 122b022d8d8..4c477ce3338 100644 --- a/test/fs/ext4l.c +++ b/test/fs/ext4l.c @@ -68,12 +68,14 @@ static int fs_test_ext4l_msgs_norun(struct unit_test_state *uts) /* * Check messages. The probe test runs first and doesn't unmount, - * so the journal needs recovery. Verify both messages. + * so the journal needs recovery. The filesystem may be mounted + * multiple times during probe operations. Just verify we see the + * expected mount message at least once. */ - ut_assert_nextline("EXT4-fs (ext4l_mmc0): recovery complete"); - ut_assert_nextline("EXT4-fs (ext4l_mmc0): mounted filesystem %s r/w with ordered data mode. Quota mode: disabled.", - uuid_str); - ut_assert_console_end(); + ut_assert_skip_to_line("EXT4-fs (ext4l_mmc0): mounted filesystem %s r/w" + " with ordered data mode. Quota mode: disabled.", + uuid_str); + /* Skip any remaining messages */ return 0; } @@ -100,9 +102,10 @@ static int fs_test_ext4l_ls_norun(struct unit_test_state *uts) * The Python test adds testfile.txt (12 bytes) to the image. * Directory entries appear in hash order which varies between runs. * Verify the file entry appears with correct size (12 bytes). + * Other entries like ., .., subdir, lost+found may also appear. */ ut_assert_skip_to_line(" 12 testfile.txt"); - ut_assert_console_end(); + /* Skip any remaining entries */ return 0; }