Re: [PATCH 3/7] test: move dm-verity testdata generation to fixture

[Sascha Hauer <s.hauer@pengutronix.de>]

On Fri, Sep 26, 2025 at 04:25:49PM +0200, Jonas Rebmann wrote:
> Hi all,
> 
> On 2025-09-26 12:14, Jonas Rebmann wrote:
> > Simplify barebox integration test setup by moving logic away from
> > scripts/ and .github/.
> > 
> > Instead of generating testdata in separate scripts, they should be
> > implemented as testfs fixtures which are automatically ran as part of
> > the test suite.
> > 
> > Includes error handling and cleanup.
> > 
> > Signed-off-by: Jonas Rebmann <jre@pengutronix.de>
> > ---
> >   scripts/generate_testfs.sh | 44 ---------------------------------------
> >   test/py/test_dm.py         | 51 ++++++++++++++++++++++++++++++++++++++++++++--
> >   2 files changed, 49 insertions(+), 46 deletions(-)
> > 
> > diff --git a/scripts/generate_testfs.sh b/scripts/generate_testfs.sh
> > index 1c358ff846..3c200bd401 100755
> > --- a/scripts/generate_testfs.sh
> > +++ b/scripts/generate_testfs.sh
> > @@ -28,47 +28,3 @@ generate_fit()
> >   	       ${KBUILD_OUTPUT}/testfs/barebox-gzipped.fit
> >   }
> >   [ -f .github/testfs/${KBUILD_DEFCONFIG}-gzipped.its ] && generate_fit
> 
> It took me some time to figure out why this patch broke CI.
> 
> With the set -e in this script, this last line of fit generation logic
> should have been
> 
>   [ -f .github/testfs/${KBUILD_DEFCONFIG}-gzipped.its ] && generate_fit || true

I fixed this up in -next so that we no longer have this in the tree when
you send your next series.

I've rewritten this to:

if [ -f .github/testfs/${KBUILD_DEFCONFIG}-gzipped.its ]; then
	generate_fit
fi

for better readability.

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |