From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Thu, 25 Mar 2021 10:44:33 +1300 Subject: [PATCH 2/3] test: Allow tests to run on any board In-Reply-To: <20210324214434.46584-1-sjg@chromium.org> References: <20210324214434.46584-1-sjg@chromium.org> Message-ID: <20210324214434.46584-2-sjg@chromium.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Due to a recent change, tests are limited to running on sandbox only. Correct this so that any architecture can run them. Signed-off-by: Simon Glass Reported-by: Sean Anderson Fixes: c79705ea938 ("test: Move dm_test_init() into test-main.c") --- include/test/test.h | 9 +++++++++ test/test-main.c | 5 ++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/test/test.h b/include/test/test.h index 0b124edd601..bf7d785d8ed 100644 --- a/include/test/test.h +++ b/include/test/test.h @@ -124,4 +124,13 @@ enum { */ struct udevice *testbus_get_clear_removed(void); +static inline void arch_reset_for_test(void) +{ +#ifdef CONFIG_SANDBOX +#include + + state_reset_for_test(state_get_current()); +#endif +} + #endif /* __TEST_TEST_H */ diff --git a/test/test-main.c b/test/test-main.c index e1b49e091ab..201e39d8b2a 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include @@ -46,9 +45,9 @@ static int dm_test_pre_run(struct unit_test_state *uts) uts->force_fail_alloc = false; uts->skip_post_probe = false; gd->dm_root = NULL; - if (!CONFIG_IS_ENABLED(OF_PLATDATA)) + if (IS_ENABLED(CONFIG_UT_DM) && !CONFIG_IS_ENABLED(OF_PLATDATA)) memset(dm_testdrv_op_count, '\0', sizeof(dm_testdrv_op_count)); - state_reset_for_test(state_get_current()); + arch_reset_for_test(); /* Determine whether to make the live tree available */ gd_set_of_root(of_live ? uts->of_root : NULL); -- 2.31.0.291.g576ba9dcdaf-goog