[PATCH 2/5] test: sandbox: fix invalid_use_of_IF_ENABLED_INT if BLOBLIST=n

[Simon Glass]

On Mon, 2 Dec 2024 at 06:46, Evgeny Bachinin
<EABachinin at salutedevices.com> wrote:
>
> Having CONFIG_OF_EMBED=y && CONFIG_BLOBLIST=n leads to the link
> error:
> ```
> ld: /tmp/ccRVty.ltrans40.ltrans.o: in function `lib_test_is_enabled':
> test/lib/kconfig.c:24: undefined reference to \
>                                        `invalid_use_of_IF_ENABLED_INT'
> ld: test/lib/kconfig.c:26: undefined reference to \
>                                 `invalid_use_of_CONFIG_IF_ENABLED_INT'
> ```
>
> Fixes: 29784d62ede ("test: Add some tests for kconfig.h")
> Signed-off-by: Evgeny Bachinin <EABachinin at salutedevices.com>
> ---
>  test/lib/kconfig.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)

This defeats the test, of course, but I suppose that is fine.

Reviewed-by: Simon Glass <sjg at chromium.org>


>
> diff --git a/test/lib/kconfig.c b/test/lib/kconfig.c
> index 0c463bb794a5e1f9f2db995d544bd723f5e59ca0..a3645abf9464785461c7250260c816e6bca03193 100644
> --- a/test/lib/kconfig.c
> +++ b/test/lib/kconfig.c
> @@ -21,10 +21,12 @@ static int lib_test_is_enabled(struct unit_test_state *uts)
>         ut_asserteq(0, CONFIG_IS_ENABLED(OF_PLATDATA));
>         ut_asserteq(0, CONFIG_IS_ENABLED(_UNDEFINED));
>
> -       ut_asserteq(0xb000,
> -                   IF_ENABLED_INT(CONFIG_BLOBLIST_FIXED, CONFIG_BLOBLIST_ADDR));
> -       ut_asserteq(0xb000,
> -                   CONFIG_IF_ENABLED_INT(BLOBLIST_FIXED, BLOBLIST_ADDR));
> +       if (IS_ENABLED(CONFIG_BLOBLIST)) {
> +               ut_asserteq(0xb000, IF_ENABLED_INT(CONFIG_BLOBLIST_FIXED,
> +                                                  CONFIG_BLOBLIST_ADDR));
> +               ut_asserteq(0xb000, CONFIG_IF_ENABLED_INT(BLOBLIST_FIXED,
> +                                                         BLOBLIST_ADDR));
> +       }
>
>         /*
>          * This fails if CONFIG_TEST_KCONFIG_ENABLE is not enabled, since the
>
> --
> 2.34.1
>