Hi Heinrich, On Thu, 14 Nov 2024 at 04:13, Heinrich Schuchardt <[email protected]> wrote: > > On 11/2/24 20:36, Simon Glass wrote: > > This test doesn't belong at the top level. Move it into the common/ > > directory, to match its implementation. > > > > Signed-off-by: Simon Glass <[email protected]> > > > > --- > > > > Changes in v2: > > - Leave the bootm rule alone, as the bootm test only runs on sandbox > > > > test/Makefile | 1 - > > test/common/Makefile | 3 +++ > > test/{ => common}/bloblist.c | 0 > > 3 files changed, 3 insertions(+), 1 deletion(-) > > rename test/{ => common}/bloblist.c (100%) > > > > diff --git a/test/Makefile b/test/Makefile > > index 145c952d2c3..5d62b5c3357 100644 > > --- a/test/Makefile > > +++ b/test/Makefile > > @@ -5,7 +5,6 @@ > > obj-y += test-main.o > > > > ifneq ($(CONFIG_$(XPL_)BLOBLIST),) > > Shouldn't this be CONFIG_$(PHASE_)BLOBLIST, see common/Makefile.
As before, we don't run this test in any xPL build. If we use PHASE_ that suggests that each xPL build has a different setting for this value. If the final part of my xPL series[1] ever lands, all of these $(xxx) things in Makefiles will go away. For now, using PHASE_ just adds confusion and might even make that migration more difficult. > > > -obj-$(CONFIG_$(XPL_)CMDLINE) += bloblist.o > > Why do we need the command line for running this test? bloblist_test_cmd_info() > > The only thing we need the command line for is issuing the 'ut' command? > > Can be remove the CMDLINE dependency or move it to 'config UNIT_TEST'. We could make the above test return -EAGAIN if !CONFIG_IS_ENABLED(CMDLINE) I suppose. > > > obj-$(CONFIG_$(XPL_)CMDLINE) += bootm.o > > endif > > obj-$(CONFIG_$(XPL_)CMDLINE) += cmd/ > > diff --git a/test/common/Makefile b/test/common/Makefile > > index 12c65f8c951..b6bff9201ec 100644 > > --- a/test/common/Makefile > > +++ b/test/common/Makefile > > @@ -1,6 +1,9 @@ > > # SPDX-License-Identifier: GPL-2.0+ > > obj-y += cmd_ut_common.o > > obj-$(CONFIG_AUTOBOOT) += test_autoboot.o > > +ifneq ($(CONFIG_$(XPL_)BLOBLIST),) > > ditto > > Best regards > > Heinrich > > > +obj-$(CONFIG_$(XPL_)CMDLINE) += bloblist.o > > +endif > > obj-$(CONFIG_CYCLIC) += cyclic.o > > obj-$(CONFIG_EVENT_DYNAMIC) += event.o > > obj-y += cread.o > > diff --git a/test/bloblist.c b/test/common/bloblist.c > > similarity index 100% > > rename from test/bloblist.c > > rename to test/common/bloblist.c > Regards, Simon [1] https://patchwork.ozlabs.org/project/uboot/list/?series=341504&state=*
