aboutsummaryrefslogtreecommitdiff
path: root/test/boot
diff options
context:
space:
mode:
authorSimon Glass2022-10-20 18:23:17 -0600
committerTom Rini2022-10-31 11:04:00 -0400
commit2a5c67f50a438b266dc72c9401e578ec8b81db16 (patch)
tree5d3c9fd55c9df768ca538848cad4433f72f04a22 /test/boot
parent5981d611788adce88974687d4d561965d964fd08 (diff)
vbe: Use a manual test
Use a manual test for the VBE test, so we can make the pytest and the C unit test work together properly. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'test/boot')
-rw-r--r--test/boot/vbe_fixup.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/test/boot/vbe_fixup.c b/test/boot/vbe_fixup.c
index 7f0f809499a..eba5c4ebe6c 100644
--- a/test/boot/vbe_fixup.c
+++ b/test/boot/vbe_fixup.c
@@ -13,21 +13,18 @@
#include <test/ut.h>
#include "bootstd_common.h"
-/* Basic test of reading nvdata and updating a fwupd node in the device tree */
-static int vbe_test_fixup(struct unit_test_state *uts)
+/*
+ * Basic test of reading nvdata and updating a fwupd node in the device tree
+ * This test works when called from test_vbe.py and it must use the flat tree,
+ * since device tree fix-ups do not yet support live tree.
+ */
+static int vbe_test_fixup_norun(struct unit_test_state *uts)
{
ofnode chosen, node;
const char *data;
oftree tree;
int size;
- /*
- * This test works when called from test_vbe.py and it must use the
- * flat tree, since device tree fix-ups do not yet support live tree.
- */
- if (!working_fdt)
- return -EAGAIN;
-
tree = oftree_from_fdt(working_fdt);
ut_assert(oftree_valid(tree));
@@ -55,5 +52,5 @@ static int vbe_test_fixup(struct unit_test_state *uts)
return 0;
}
-BOOTSTD_TEST(vbe_test_fixup,
- UT_TESTF_DM | UT_TESTF_SCAN_FDT | UT_TESTF_FLAT_TREE);
+BOOTSTD_TEST(vbe_test_fixup_norun, UT_TESTF_DM | UT_TESTF_SCAN_FDT |
+ UT_TESTF_FLAT_TREE | UT_TESTF_MANUAL);