Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7DCF4C433F5 for ; Mon, 9 May 2022 18:06:31 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CE6BD83ED8; Mon, 9 May 2022 20:06:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="Vk4vQbjB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AADD683DEB; Mon, 9 May 2022 20:06:26 +0200 (CEST) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 570DD83EDD for ; Mon, 9 May 2022 20:06:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652119578; bh=RzkBbYjbMlu3YpIMAA6XiGXiAMLpWbKMPuXj9mqlOQI=; h=X-UI-Sender-Class:Date:Subject:To:Cc:References:From:In-Reply-To; b=Vk4vQbjBoAPPd+/yT06/vuj0RC6KJDE7rP8IzChPDYFu6yhnB74XjRjLLwVISOjQj 6iD7yddTNcRjvcexCiOlF/RM+h2g4VV81my+eUofW+gBpUt4anOY5VKHZlp+k4FjUt CqueRvudrqtTFmzgdbA+v3zsX8epuAXg2V0wgLYo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [192.168.123.94] ([62.143.94.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MY68T-1nHtfr0NXZ-00YNfz; Mon, 09 May 2022 20:06:18 +0200 Message-ID: <33ad5015-c022-b178-28e2-29a00b66ef30@gmx.de> Date: Mon, 9 May 2022 20:06:13 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Subject: Re: [PATCH v5 32/34] bootstd: Add setup for the bootflow tests Content-Language: en-US To: Simon Glass Cc: Dennis Gilmore , Lukas Auer , Daniel Schwierzeck , Tom Rini , Michal Simek , Ilias Apalodimas , Steffen Jaeckel , U-Boot Mailing List References: <20220425053127.19950-1-sjg@chromium.org> <20220425053127.19950-22-sjg@chromium.org> From: Heinrich Schuchardt In-Reply-To: <20220425053127.19950-22-sjg@chromium.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:L/Y4lL0cT4W20lEiNsShJnlGMOqmoYPTKkGCyALCpdXtOakPB9D akly58L4Gr/nfYkwH+JwLGc0y6ZeTmS+4uLaNO4pTR2GBcblc8wEmLcLuzHldD0KJk+pT9s irlJC7dAoVWGUBZlXSJconpRxh40fEEeRtpATg7iMJ//wDGqgYZQ5f5b9e28ENC7t8RiV1w DLczRLr09aMfS+14tKkMQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:Tz7NI/Tilak=:W70/zITL+m29dqM0W7c0BS PTCt251s6Yu40xN2u8bX8LOdC8Sr+/mSXTKA0Vx0KCzCQ+AVFNObKi3uV8HGDVBTJybZ45N2J d5g8dGrR1Ke2hWhvTj7mbgMfWEHKB4lwxj1TCuA0/KC4skGcp6UvbQRVm22PSjCxwOfOhaztn 0qU7sEoSHke9U0zXmrJ/JaeLOi1H9vtnj3GcDSZgceNYS2SO+5P771zO+vJ83Rilq/t2xCFn3 ZJGibrgLTEr/EFHTY4fCArziyJeNJAuA8j7ooR6qMpf3m9bFWChUqURUwXM+jTv6Uadc61L4w FV2Cv9E13nqinhIaFOil8Kh2bt4yJzM/S/UrqkTk+FOG1L5prAGmu2zUL63UCaexsFKXBsorV MAK1Lf+AfQig1sSR5cRaV+pRfooY6OAAfpGt7tJanu6u82ghatI/O7fJr0Ly11wwRM7wmYN2Y 3NeqeWFKGPrlcZfeeI/ZHpl7331gwGxFGAbwD2sN+REwvr3FbgSCalNJb5YnVm2DbCtCk2M0w djq/1p7d0PxqwQmzJ+HBrdWR4Khev3JWrrFiLNN7zo8dOMCmMqcc5hFqdZiqXyTKFw+3ekEGE o7037U7Cbuco5B6omsWf5oxiZRf5cLwkJcbZG9S5zIazrZaFaYVndSTH6x2lC4NsbndYxxtok tFH4GOORY+ME/U7YjvLL/MAPZ2SpggbB8hm+O2f7DMJVm+2+T6jKX4CHb0RVg/QGkktBWGiij Cd1iCmtoKYdC+V/P9AXsNzPNYS9x06aL4P1CWcm/8k0aSOUHtan9jKK1b/PBeugt9MPjNCvIF pGGL8dgDxu/Vex0t3HKZuL1GBRKjPmcenRS/4WGXpnBU8UiaipVBcBff2FOlkkQyNlTeAXVBv cSBDmpY4dZXNN5L8mjuXTZ8dwayTKOaMr1enptjZBSMCPhyz6/ZyCHunH/Au9j/uCyc0yFknF 5C2crlcuZptC3easCg2psKr/RJTRMtAyjnS4vKV93ZmTpv34425k/YXUNk8UexhUCKFDX7xn0 6NQZ2V35pxCvv/ArLTEbvk1QmF7+df/oMeDLZuvfFtwcxM6nvpbi+WdCW/cOYhSrIR/tMfYtJ ocGIRcH11Ttk80= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean On 4/25/22 07:31, Simon Glass wrote: > We need to create a disk image with a partition table and a DOS-format > filesystem containing a few files. Provide a fallback binary for CI sinc= e > it does not seem able to detect the loopback partitions. > > Add this to a dm_init test so that it happens when needed. > > Signed-off-by: Simon Glass > --- > > (no changes since v3) > > Changes in v3: > - Update test condition to use CMD_BOOTFLOW > > test/py/tests/bootstd/mmc1.img.xz | Bin 0 -> 4448 bytes > test/py/tests/test_ut.py | 103 ++++++++++++++++++++++++++++++ > 2 files changed, 103 insertions(+) > create mode 100644 test/py/tests/bootstd/mmc1.img.xz > > diff --git a/test/py/tests/bootstd/mmc1.img.xz b/test/py/tests/bootstd/m= mc1.img.xz > new file mode 100644 > index 0000000000000000000000000000000000000000..4e7f39b830eb4bddcb9ff6df= 39e89f130b5706b9 > GIT binary patch > literal 4448 > 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 > > literal 0 > HcmV?d00001 > > diff --git a/test/py/tests/test_ut.py b/test/py/tests/test_ut.py > index 01c2b3ffa12..35fb393c1ff 100644 > --- a/test/py/tests/test_ut.py > +++ b/test/py/tests/test_ut.py > @@ -1,9 +1,102 @@ > # SPDX-License-Identifier: GPL-2.0 > # Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. > > +import gzip > +import os > import os.path > import pytest > > +import u_boot_utils > + > +def mkdir_cond(dirname): > + """Create a directory if it doesn't already exist > + > + Args: > + dirname: Name of directory to create > + """ > + if not os.path.exists(dirname): > + os.mkdir(dirname) > + > +def setup_bootflow_image(u_boot_console): > + """Create a 20MB disk image with a single FAT partition""" > + cons =3D u_boot_console > + fname =3D os.path.join(cons.config.source_dir, 'mmc1.img') > + mnt =3D os.path.join(cons.config.persistent_data_dir, 'mnt') > + mkdir_cond(mnt) > + > + u_boot_utils.run_and_log(cons, 'qemu-img create %s 20M' % fname) > + u_boot_utils.run_and_log(cons, 'sudo sfdisk %s' % fname, > + stdin=3Db'type=3Dc') We should never request to run a test as sudo. Please, change this test to use virt-make-fs like we do in all other tests that create an image. Best regards Heinrich > + > + loop =3D None > + mounted =3D False > + complete =3D False > + try: > + out =3D u_boot_utils.run_and_log(cons, > + 'sudo losetup --show -f -P %s' %= fname) > + loop =3D out.strip() > + fatpart =3D '%sp1' % loop > + u_boot_utils.run_and_log(cons, 'sudo mkfs.vfat %s' % fatpart) > + u_boot_utils.run_and_log( > + cons, 'sudo mount -o loop %s %s -o uid=3D%d,gid=3D%d' % > + (fatpart, mnt, os.getuid(), os.getgid())) > + mounted =3D True > + > + vmlinux =3D 'vmlinuz-5.3.7-301.fc31.armv7hl' > + initrd =3D 'initramfs-5.3.7-301.fc31.armv7hl.img' > + dtbdir =3D 'dtb-5.3.7-301.fc31.armv7hl' > + script =3D '''# extlinux.conf generated by appliance-creator > +ui menu.c32 > +menu autoboot Welcome to Fedora-Workstation-armhfp-31-1.9. Automatic bo= ot in # second{,s}. Press a key for options. > +menu title Fedora-Workstation-armhfp-31-1.9 Boot Options. > +menu hidden > +timeout 20 > +totaltimeout 600 > + > +label Fedora-Workstation-armhfp-31-1.9 (5.3.7-301.fc31.armv7hl) > + kernel /%s > + append ro root=3DUUID=3D9732b35b-4cd5-458b-9b91-80f7047e0b8a rh= gb quiet LANG=3Den_US.UTF-8 cma=3D192MB cma=3D256MB > + fdtdir /%s/ > + initrd /%s''' % (vmlinux, dtbdir, initrd) > + ext =3D os.path.join(mnt, 'extlinux') > + mkdir_cond(ext) > + > + with open(os.path.join(ext, 'extlinux.conf'), 'w') as fd: > + print(script, file=3Dfd) > + > + inf =3D os.path.join(cons.config.persistent_data_dir, 'inf') > + with open(inf, 'wb') as fd: > + fd.write(gzip.compress(b'vmlinux')) > + u_boot_utils.run_and_log(cons, 'mkimage -f auto -d %s %s' % > + (inf, os.path.join(mnt, vmlinux))) > + > + with open(os.path.join(mnt, initrd), 'w') as fd: > + print('initrd', file=3Dfd) > + > + mkdir_cond(os.path.join(mnt, dtbdir)) > + > + dtb_file =3D os.path.join(mnt, '%s/sandbox.dtb' % dtbdir) > + u_boot_utils.run_and_log( > + cons, 'dtc -o %s' % dtb_file, stdin=3Db'/dts-v1/; / {};') > + complete =3D True > + except ValueError as exc: > + print('Falled to create image, failing back to prepared copy: %= s', > + str(exc)) > + finally: > + if mounted: > + u_boot_utils.run_and_log(cons, 'sudo umount %s' % mnt) > + if loop: > + u_boot_utils.run_and_log(cons, 'sudo losetup -d %s' % loop) > + > + if not complete: > + # Use a prepared image since we cannot create one > + infname =3D os.path.join(cons.config.source_dir, > + 'test/py/tests/bootstd/mmc1.img.xz') > + u_boot_utils.run_and_log( > + cons, > + ['sh', '-c', 'xz -dc %s >%s' % (infname, fname)]) > + > + > @pytest.mark.buildconfigspec('ut_dm') > def test_ut_dm_init(u_boot_console): > """Initialize data for ut dm tests.""" > @@ -21,6 +114,16 @@ def test_ut_dm_init(u_boot_console): > with open(fn, 'wb') as fh: > fh.write(data) > > +@pytest.mark.buildconfigspec('cmd_bootflow') > +def test_ut_dm_init_bootstd(u_boot_console): > + """Initialise data for bootflow tests""" > + > + setup_bootflow_image(u_boot_console) > + > + # Restart so that the new mmc1.img is picked up > + u_boot_console.restart_uboot() > + > + > def test_ut(u_boot_console, ut_subtest): > """Execute a "ut" subtest. >