leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: Drop the UT_TESTF_LIVE_OR_FLAT flag

Browse Source 
This was a workaround for a rare situation. Now that it will be more
common and we have a proper fix, drop the flag. We can run both types of
tests in the same sandbox executable, even if the flat device tree is
modified.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2022-09-06 20:27:07 -06:00 committed by Tom Rini
parent eb6e903a56
commit 2b90e0d54e
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/test/test.h
View File

@ -54,8 +54,6 @@ enum {
UT_TESTF_CONSOLE_REC = BIT(5), /* needs console recording */ UT_TESTF_CONSOLE_REC = BIT(5), /* needs console recording */
/* do extra driver model init and uninit */ /* do extra driver model init and uninit */
UT_TESTF_DM = BIT(6), UT_TESTF_DM = BIT(6),
/* live or flat device tree, but not both in the same executable */
UT_TESTF_LIVE_OR_FLAT = BIT(7),
}; };
/** /**

16
test/dm/ofnode.c
View File

@ -546,10 +546,6 @@ static int dm_test_ofnode_livetree_writing(struct unit_test_state *uts)
struct udevice *dev; struct udevice *dev;
ofnode node; ofnode node;
/* temporarily disable this test due to a failure fixed later */
if (!of_live_active())
return 0;
/* Test enabling devices */ /* Test enabling devices */
node = ofnode_path("/usb@2"); node = ofnode_path("/usb@2");
@ -588,7 +584,7 @@ static int dm_test_ofnode_livetree_writing(struct unit_test_state *uts)
return 0; return 0;
} }
DM_TEST(dm_test_ofnode_livetree_writing, DM_TEST(dm_test_ofnode_livetree_writing,
UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT | UT_TESTF_LIVE_OR_FLAT); UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);
static int dm_test_ofnode_u32(struct unit_test_state *uts) static int dm_test_ofnode_u32(struct unit_test_state *uts)
{ {
@ -603,18 +599,13 @@ static int dm_test_ofnode_u32(struct unit_test_state *uts)
return 0; return 0;
} }
DM_TEST(dm_test_ofnode_u32, DM_TEST(dm_test_ofnode_u32, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);
UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT | UT_TESTF_LIVE_OR_FLAT);
static int dm_test_ofnode_add_subnode(struct unit_test_state *uts) static int dm_test_ofnode_add_subnode(struct unit_test_state *uts)
{ {
ofnode node, check, subnode; ofnode node, check, subnode;
char buf[128]; char buf[128];
/* temporarily disable this test due to a failure fixed later */
if (!of_live_active())
return 0;
node = ofnode_path("/lcd"); node = ofnode_path("/lcd");
ut_assert(ofnode_valid(node)); ut_assert(ofnode_valid(node));
ut_assertok(ofnode_add_subnode(node, "edmund", &subnode)); ut_assertok(ofnode_add_subnode(node, "edmund", &subnode));
@ -677,5 +668,4 @@ static int dm_test_ofnode_add_subnode(struct unit_test_state *uts)
return 0; return 0;
} }
DM_TEST(dm_test_ofnode_add_subnode, DM_TEST(dm_test_ofnode_add_subnode, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);
UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT | UT_TESTF_LIVE_OR_FLAT);