{"id":2219807,"url":"http://patchwork.ozlabs.org/api/patches/2219807/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260404140328.3724864-10-sjg@chromium.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260404140328.3724864-10-sjg@chromium.org>","list_archive_url":null,"date":"2026-04-04T14:03:13","name":"[09/14] test: Convert setup_bootflow_image() to use FsHelper","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"577bda7dafc73ba27eb4df5e542b440e74239baf","submitter":{"id":6170,"url":"http://patchwork.ozlabs.org/api/people/6170/?format=json","name":"Simon Glass","email":"sjg@chromium.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20260404140328.3724864-10-sjg@chromium.org/mbox/","series":[{"id":498729,"url":"http://patchwork.ozlabs.org/api/series/498729/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=498729","date":"2026-04-04T14:03:04","name":"test: Convert tests to use FsHelper and DiskHelper","version":1,"mbox":"http://patchwork.ozlabs.org/series/498729/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2219807/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219807/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256\n header.s=google header.b=Nd31spBu;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=chromium.org","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org\n header.b=\"Nd31spBu\";\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=chromium.org","phobos.denx.de;\n spf=pass smtp.mailfrom=sjg@chromium.org"],"Received":["from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fny6862CRz1yCs\n\tfor ; Sun, 05 Apr 2026 01:05:20 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id F39BF84178;\n\tSat, 4 Apr 2026 16:04:16 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id 1F7DD84181; Sat, 4 Apr 2026 16:04:16 +0200 (CEST)","from mail-oa1-x2d.google.com (mail-oa1-x2d.google.com\n [IPv6:2001:4860:4864:20::2d])\n (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id E43AA8416F\n for ; Sat, 4 Apr 2026 16:04:13 +0200 (CEST)","by mail-oa1-x2d.google.com with SMTP id\n 586e51a60fabf-4233e152457so210888fac.1\n for ; Sat, 04 Apr 2026 07:04:13 -0700 (PDT)","from chromium.org ([73.34.74.121]) by smtp.gmail.com with ESMTPSA id\n 586e51a60fabf-4232eb3d0e4sm2348235fac.6.2026.04.04.07.04.09\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sat, 04 Apr 2026 07:04:10 -0700 (PDT)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,\n RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham\n autolearn_force=no version=3.4.2","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=chromium.org; s=google; t=1775311452; x=1775916252; darn=lists.denx.de;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=FWefJqWhgSH+VDXEZMtiFzLAShn/sHtvtWnUNBu7xVg=;\n b=Nd31spBuOiEZdEL6iu5cc/sKh2ac07A8qQ+Y0PWf5u7Y0bZ7MYR5dU67BnffN3DNnt\n 3oVvLr2WEunr/gncL5eaPvpQVjMYg/lpRoyZR1Jsf4VYnQOdQvJA4r9KVv6gYh2buKCj\n PJ1Tg9SoDaj3UE98JM+tyCKN42HX3KXfART5k=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775311452; x=1775916252;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=FWefJqWhgSH+VDXEZMtiFzLAShn/sHtvtWnUNBu7xVg=;\n b=cZmPqRv3UtqFjVAvp2D2tZ26GnLjzWz1VJZ9oHDTre2bSxmlsWl9Cs0ybJkf1a8ngq\n yJtRsRC93FlZsMWo89ojc8CiJBiO43TX1AZTgLyv/5xU4qnrvlS6nDe8CCA4A6weAW8G\n preUQOkbmfcGzg/HiUOMWiri0VOqvvAL6ixmi3REhcIRCQgBrUd/GNAV6pITN4gQS2AP\n ZKWMzioCDAapNZwFe9OAslhhKP3NhWkc/jsW2OAzC3clPCL/Xp7hhv5y+oUiU4ko6UDc\n yWL0fGeD3zdzMOEn+T4x0IxNgIY5yS67Mo6UYIEH2XwS0FabEF4T9GTcIp9oxnfU5s1K\n P+vw==","X-Gm-Message-State":"AOJu0YzF5UjwtIInWKs9C+z7BH3WvPePTEDgGSZFl5WdUzAVCoL+P8JV\n PGUzdGb6pR5boFS8z1oZlwC08BxMe1K2KWMCkNRDUse3hmbQeGZ+FpX32lkr557jIukp9c7HoUF\n Sid4=","X-Gm-Gg":"AeBDiesgqNeqK+Qzlg/k9aN/FI0EVbYj3U7zs7omZJF7UQxTKKUcd9goBWTv7gDhV0J\n 729peGvqZ4pdTzWcYBRcIx5vMMtFYUFD2RRdN2F1qyffFzu7obfEXpHKrKKoh+FPf/46L//vI3/\n ZhJrXY/q5fs4VoQYXEKPG6feTJbzcUHIdQ55yeCarfB8mV43+/1syMymjRq0SiLYgeVlWCfZDUQ\n PPy6YakJLwDcCiYkn5lLMEAZatuvBN/oyl63BvPsJwakBMyHLFnvTfmQV5viUpgUKaVeYkXSMQW\n aT1EBki/iy+Fjd3lv0JkDWwRiM7EOqvb948qC5Lw3ANciA9qIoAotZ4HK2IwEEd1lxinX3kxdMg\n ug19F+N73YPY01mghtyYEoNnsdEmS2rO7SKXI2/bnnkhtxiBs19HkVuiZ1DqZnKV4y+b6DTSWvP\n /hEEdpu4A+aKHNKldHpQ==","X-Received":"by 2002:a05:6870:ef17:b0:417:5ca8:8155 with SMTP id\n 586e51a60fabf-42310131c73mr3698953fac.24.1775311451998;\n Sat, 04 Apr 2026 07:04:11 -0700 (PDT)","From":"Simon Glass ","To":"u-boot@lists.denx.de","Cc":"Simon Glass , Heinrich Schuchardt ,\n Marek Vasut ,\n Martin Schwan ,\n Mattijs Korpershoek ,\n Tom Rini ","Subject":"[PATCH 09/14] test: Convert setup_bootflow_image() to use FsHelper","Date":"Sat, 4 Apr 2026 08:03:13 -0600","Message-ID":"<20260404140328.3724864-10-sjg@chromium.org>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260404140328.3724864-1-sjg@chromium.org>","References":"<20260404140328.3724864-1-sjg@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.39","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" ","X-Virus-Scanned":"clamav-milter 0.103.8 at phobos.denx.de","X-Virus-Status":"Clean"},"content":"Simplify this test-setup code by using the helper.\n\nSigned-off-by: Simon Glass \n---\n\n test/py/tests/test_ut.py | 33 +++++++++++++++++++--------------\n 1 file changed, 19 insertions(+), 14 deletions(-)","diff":"diff --git a/test/py/tests/test_ut.py b/test/py/tests/test_ut.py\nindex 758f99cbfce..8bc915ee5e0 100644\n--- a/test/py/tests/test_ut.py\n+++ b/test/py/tests/test_ut.py\n@@ -172,10 +172,10 @@ def setup_bootflow_image(ubman, devnum, basename, vmlinux, initrd, dtbdir,\n dtbdir (str or None): Devicetree filename\n script (str): Script to place in the extlinux.conf file\n \"\"\"\n- fname, mnt = fs_helper.setup_image(ubman, devnum, 0xc, second_part=True,\n- basename=basename)\n+ fsh = FsHelper(ubman.config, 'vfat', 18, prefix=basename)\n+ fsh.setup()\n \n- ext = os.path.join(mnt, 'extlinux')\n+ ext = os.path.join(fsh.srcdir, 'extlinux')\n mkdir_cond(ext)\n \n conf = os.path.join(ext, 'extlinux.conf')\n@@ -187,25 +187,30 @@ def setup_bootflow_image(ubman, devnum, basename, vmlinux, initrd, dtbdir,\n fd.write(gzip.compress(b'vmlinux'))\n mkimage = ubman.config.build_dir + '/tools/mkimage'\n utils.run_and_log(\n- ubman, f'{mkimage} -f auto -d {inf} {os.path.join(mnt, vmlinux)}')\n+ ubman, f'{mkimage} -f auto -d {inf} {os.path.join(fsh.srcdir, vmlinux)}')\n \n- with open(os.path.join(mnt, initrd), 'w', encoding='ascii') as fd:\n+ with open(os.path.join(fsh.srcdir, initrd), 'w', encoding='ascii') as fd:\n print('initrd', file=fd)\n \n if dtbdir:\n- mkdir_cond(os.path.join(mnt, dtbdir))\n+ mkdir_cond(os.path.join(fsh.srcdir, dtbdir))\n \n- dtb_file = os.path.join(mnt, f'{dtbdir}/sandbox.dtb')\n+ dtb_file = os.path.join(fsh.srcdir, f'{dtbdir}/sandbox.dtb')\n utils.run_and_log(\n ubman, f'dtc -o {dtb_file}', stdin=b'/dts-v1/; / {};')\n \n- fsfile = 'vfat18M.img'\n- utils.run_and_log(ubman, f'fallocate -l 18M {fsfile}')\n- utils.run_and_log(ubman, f'mkfs.vfat {fsfile}')\n- utils.run_and_log(ubman, ['sh', '-c', f'mcopy -i {fsfile} {mnt}/* ::/'])\n- copy_partition(ubman, fsfile, fname)\n- utils.run_and_log(ubman, f'rm -rf {mnt}')\n- utils.run_and_log(ubman, f'rm -f {fsfile}')\n+ fsh.mk_fs()\n+\n+ img = DiskHelper(ubman.config, devnum, basename, True)\n+ img.add_fs(fsh, DiskHelper.VFAT, bootable=True)\n+\n+ ext4 = FsHelper(ubman.config, 'ext4', 1, prefix=basename)\n+ ext4.setup()\n+ ext4.mk_fs()\n+\n+ img.add_fs(ext4, DiskHelper.EXT4)\n+ img.create()\n+ fsh.cleanup()\n \n def setup_fedora_image(ubman, devnum, basename):\n \"\"\"Create a 20MB Fedora disk image with a single FAT partition\n","prefixes":["09/14"]}