diff options
| author | Simon Glass | 2022-09-06 20:27:07 -0600 |
|---|---|---|
| committer | Tom Rini | 2022-09-29 16:09:56 -0400 |
| commit | 2b90e0d54efe6e83c9313c863184b71eb811853e (patch) | |
| tree | 00570a7ec4f29d347e0605434eb71d94e61dae84 /test | |
| parent | eb6e903a569d35032ca3772d93c26fb1071ab3ae (diff) | |
test: Drop the UT_TESTF_LIVE_OR_FLAT flag
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>
Diffstat (limited to 'test')
| -rw-r--r-- | test/dm/ofnode.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c index 0f65ff939fb..a421392a976 100644 --- a/test/dm/ofnode.c +++ b/test/dm/ofnode.c @@ -546,10 +546,6 @@ static int dm_test_ofnode_livetree_writing(struct unit_test_state *uts) struct udevice *dev; ofnode node; - /* temporarily disable this test due to a failure fixed later */ - if (!of_live_active()) - return 0; - /* Test enabling devices */ node = ofnode_path("/usb@2"); @@ -588,7 +584,7 @@ static int dm_test_ofnode_livetree_writing(struct unit_test_state *uts) return 0; } 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) { @@ -603,18 +599,13 @@ static int dm_test_ofnode_u32(struct unit_test_state *uts) return 0; } -DM_TEST(dm_test_ofnode_u32, - UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT | UT_TESTF_LIVE_OR_FLAT); +DM_TEST(dm_test_ofnode_u32, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); static int dm_test_ofnode_add_subnode(struct unit_test_state *uts) { ofnode node, check, subnode; char buf[128]; - /* temporarily disable this test due to a failure fixed later */ - if (!of_live_active()) - return 0; - node = ofnode_path("/lcd"); ut_assert(ofnode_valid(node)); 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; } -DM_TEST(dm_test_ofnode_add_subnode, - UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT | UT_TESTF_LIVE_OR_FLAT); +DM_TEST(dm_test_ofnode_add_subnode, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); |