]> git.dujemihanovic.xyz Git - u-boot.git/commit
test: boot: Set DM|SCAN_FDT flags for bootmeth_{cros,android}
authorMattijs Korpershoek <mkorpershoek@baylibre.com>
Fri, 22 Nov 2024 14:11:34 +0000 (15:11 +0100)
committerTom Rini <trini@konsulko.com>
Fri, 22 Nov 2024 20:37:21 +0000 (14:37 -0600)
commite92b5d0ddfbe95b0d6bf5277f06d00b1acfa0b83
tree007033837d67ab479045ffb2f861d0d1c2cf7cd7
parent35d5ad6cf25f8c0ac39f90a8a51eb77e6e002d0d
test: boot: Set DM|SCAN_FDT flags for bootmeth_{cros,android}

We make fewer calls to dm_test_restore() since
commit fbdac8155c89 ("test: Expand implementation of ut_list_has_dm_tests()")

Because of this some valid test combinations are now broken:

$ ./test/py/test.py --bd sandbox --build -k test_ut
$ ./test/py/test.py --bd sandbox --build -k "bootflow_android or bootflow_cros"

Shows:

  Expected '  2  cros         ready   mmc          4 mmc5.bootdev.part_4       ',
  got '  2  cros         ready   mmc          2 mmc5.bootdev.part_2       '

Here prep_mmc_bootdev() is called twice and it will bind bootmeth_cros twice.

Since bootmeth_cros is bound twice, 'bootflow scan' will find 2x the
expected bootflows.

Before
commit fbdac8155c89 ("test: Expand implementation of ut_list_has_dm_tests()")
this did not happen because a cleanup was called each time.

Add UTF_DM and UTF_SCAN_FDT flags to both tests to make sure that the
bootmeths are unbound after the test finishes.

Fixes: fbdac8155c89 ("test: Expand implementation of ut_list_has_dm_tests()")
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
test/boot/bootflow.c