[PATCH v5 27/41] test: Add ut_run_test_live_flat() to run tests twice
Simon Glass
sjg at chromium.org
Mon Mar 8 01:35:03 CET 2021
Driver model tests are generally run twice, once with livetree enable and
again with it disabled. Add a function to handle this and call it from the
driver model test runner.
Make ut_run_test() private since it is not used outside test-main.c now.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
(no changes since v2)
Changes in v2:
- Fix conditions so non-DM SPL tests are actually run
include/test/ut.h | 13 +++++----
test/dm/test-dm.c | 37 +-------------------------
test/test-main.c | 67 ++++++++++++++++++++++++++++++++++++++++++++---
3 files changed, 73 insertions(+), 44 deletions(-)
diff --git a/include/test/ut.h b/include/test/ut.h
index adef0b7e1cf..d06bc5089be 100644
--- a/include/test/ut.h
+++ b/include/test/ut.h
@@ -368,10 +368,13 @@ void ut_unsilence_console(struct unit_test_state *uts);
void ut_set_skip_delays(struct unit_test_state *uts, bool skip_delays);
/**
- * ut_run_test() - Run a single test
+ * ut_run_test_live_flat() - Run a test with both live and flat tree
*
- * This runs the test, handling any preparation and clean-up needed. It prints
- * the name of each test before running it.
+ * This calls ut_run_test() with livetree enabled, which is the standard setup
+ * for runnig tests. Then, for driver model test, it calls it again with
+ * livetree disabled. This allows checking of flattree being used when OF_LIVE
+ * is enabled, as is the case in U-Boot proper before relocation, as well as in
+ * SPL.
*
* @uts: Test state to update. The caller should ensure that this is zeroed for
* the first call to this function. On exit, @uts->fail_count is
@@ -381,8 +384,8 @@ void ut_set_skip_delays(struct unit_test_state *uts, bool skip_delays);
* @return 0 if all tests passed, -EAGAIN if the test should be skipped, -1 if
* any failed
*/
-int ut_run_test(struct unit_test_state *uts, struct unit_test *test,
- const char *name);
+int ut_run_test_live_flat(struct unit_test_state *uts, struct unit_test *test,
+ const char *name);
/**
* ut_run_tests() - Run a set of tests
diff --git a/test/dm/test-dm.c b/test/dm/test-dm.c
index de41fc09db0..826b64565e8 100644
--- a/test/dm/test-dm.c
+++ b/test/dm/test-dm.c
@@ -22,21 +22,6 @@ DECLARE_GLOBAL_DATA_PTR;
struct unit_test_state global_dm_test_state;
-/**
- * dm_test_run_on_flattree() - Check if we should run a test with flat DT
- *
- * This skips long/slow tests where there is not much value in running a flat
- * DT test in addition to a live DT test.
- *
- * @return true to run the given test on the flat device tree
- */
-static bool dm_test_run_on_flattree(struct unit_test *test)
-{
- const char *fname = strrchr(test->file, '/') + 1;
-
- return !strstr(fname, "video") || strstr(test->name, "video_base");
-}
-
static bool test_matches(const char *test_name, const char *find_name)
{
if (!find_name)
@@ -85,31 +70,11 @@ int dm_test_run(const char *test_name)
uts->of_root = gd_of_root();
for (test = tests; test < tests + n_ents; test++) {
const char *name = test->name;
- int runs;
if (!test_matches(name, test_name))
continue;
- /* Run with the live tree if possible */
- runs = 0;
- if (CONFIG_IS_ENABLED(OF_LIVE)) {
- if (!(test->flags & UT_TESTF_FLAT_TREE)) {
- uts->of_live = true;
- ut_assertok(ut_run_test(uts, test, test->name));
- runs++;
- }
- }
-
- /*
- * Run with the flat tree if we couldn't run it with live tree,
- * or it is a core test.
- */
- if (!(test->flags & UT_TESTF_LIVE_TREE) &&
- (!runs || dm_test_run_on_flattree(test))) {
- uts->of_live = false;
- ut_assertok(ut_run_test(uts, test, test->name));
- runs++;
- }
+ ut_assertok(ut_run_test_live_flat(uts, test, test->name));
found++;
}
diff --git a/test/test-main.c b/test/test-main.c
index 32c4d4b1996..4e17c9edb28 100644
--- a/test/test-main.c
+++ b/test/test-main.c
@@ -80,6 +80,24 @@ static int do_autoprobe(struct unit_test_state *uts)
return ret;
}
+/*
+ * ut_test_run_on_flattree() - Check if we should run a test with flat DT
+ *
+ * This skips long/slow tests where there is not much value in running a flat
+ * DT test in addition to a live DT test.
+ *
+ * @return true to run the given test on the flat device tree
+ */
+static bool ut_test_run_on_flattree(struct unit_test *test)
+{
+ const char *fname = strrchr(test->file, '/') + 1;
+
+ if (!(test->flags & UT_TESTF_DM))
+ return false;
+
+ return !strstr(fname, "video") || strstr(test->name, "video_base");
+}
+
/**
* test_pre_run() - Handle any preparation needed to run a test
*
@@ -137,8 +155,22 @@ static int test_post_run(struct unit_test_state *uts, struct unit_test *test)
return 0;
}
-int ut_run_test(struct unit_test_state *uts, struct unit_test *test,
- const char *test_name)
+/**
+ * ut_run_test() - Run a single test
+ *
+ * This runs the test, handling any preparation and clean-up needed. It prints
+ * the name of each test before running it.
+ *
+ * @uts: Test state to update. The caller should ensure that this is zeroed for
+ * the first call to this function. On exit, @uts->fail_count is
+ * incremented by the number of failures (0, one hopes)
+ * @test_name: Test to run
+ * @name: Name of test, possibly skipping a prefix that should not be displayed
+ * @return 0 if all tests passed, -EAGAIN if the test should be skipped, -1 if
+ * any failed
+ */
+static int ut_run_test(struct unit_test_state *uts, struct unit_test *test,
+ const char *test_name)
{
const char *fname = strrchr(test->file, '/') + 1;
const char *note = "";
@@ -163,6 +195,35 @@ int ut_run_test(struct unit_test_state *uts, struct unit_test *test,
return 0;
}
+int ut_run_test_live_flat(struct unit_test_state *uts, struct unit_test *test,
+ const char *name)
+{
+ int runs;
+
+ /* Run with the live tree if possible */
+ runs = 0;
+ if (CONFIG_IS_ENABLED(OF_LIVE)) {
+ if (!(test->flags & UT_TESTF_FLAT_TREE)) {
+ uts->of_live = true;
+ ut_assertok(ut_run_test(uts, test, test->name));
+ runs++;
+ }
+ }
+
+ /*
+ * Run with the flat tree if we couldn't run it with live tree,
+ * or it is a core test.
+ */
+ if (!(test->flags & UT_TESTF_LIVE_TREE) &&
+ (!runs || ut_test_run_on_flattree(test))) {
+ uts->of_live = false;
+ ut_assertok(ut_run_test(uts, test, test->name));
+ runs++;
+ }
+
+ return 0;
+}
+
int ut_run_tests(struct unit_test_state *uts, const char *prefix,
struct unit_test *tests, int count, const char *select_name)
{
@@ -180,7 +241,7 @@ int ut_run_tests(struct unit_test_state *uts, const char *prefix,
if (select_name && strcmp(select_name, test_name))
continue;
- ret = ut_run_test(uts, test, test_name);
+ ret = ut_run_test_live_flat(uts, test, test_name);
found++;
if (ret == -EAGAIN)
continue;
--
2.30.1.766.gb4fecdf3b7-goog
More information about the U-Boot
mailing list