From 72b524cf426697e764c9c63611d0f6743f50f0f5 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Sun, 7 Mar 2021 17:34:56 -0700
Subject: [PATCH] test: Handle driver model reinit in test_pre_run()
For driver model tests we want to reinit the data structures so that
everything is in a known state before the test runs. This avoids one test
changing something that breaks a subsequent tests.
Move the call for this into test_pre_run().
Signed-off-by: Simon Glass <sjg@chromium.org>
---
include/test/test.h | 2 ++
include/test/ut.h | 10 ++++++++++
test/dm/test-dm.c | 6 +++---
test/test-main.c | 3 +++
4 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/include/test/test.h b/include/test/test.h
index d282cb2362..6997568cc0 100644
--- a/include/test/test.h
+++ b/include/test/test.h
@@ -15,6 +15,7 @@
* @fail_count: Number of tests that failed
* @start: Store the starting mallinfo when doing leak test
* @priv: A pointer to some other info some suites want to track
+ * @of_live: true to use livetree if available, false to use flattree
* @of_root: Record of the livetree root node (used for setting up tests)
* @expect_str: Temporary string used to hold expected string value
* @actual_str: Temporary string used to hold actual string value
@@ -24,6 +25,7 @@ struct unit_test_state {
struct mallinfo start;
void *priv;
struct device_node *of_root;
+ bool of_live;
char expect_str[256];
char actual_str[256];
};
diff --git a/include/test/ut.h b/include/test/ut.h
index e5ec18e60b..6e56ca99c3 100644
--- a/include/test/ut.h
+++ b/include/test/ut.h
@@ -387,6 +387,16 @@ int test_pre_run(struct unit_test_state *uts, struct unit_test *test);
*/
int test_post_run(struct unit_test_state *uts, struct unit_test *test);
+/**
+ * dm_test_init() - Get ready to run a driver model test
+ *
+ * This clears out the driver model data structures. For sandbox it resets the
+ * state structure.
+ *
+ * @uts: Test state
+ */
+int dm_test_init(struct unit_test_state *uts);
+
/**
* ut_run_tests() - Run a set of tests
*
diff --git a/test/dm/test-dm.c b/test/dm/test-dm.c
index 569ffbbad9..ceeac3fd36 100644
--- a/test/dm/test-dm.c
+++ b/test/dm/test-dm.c
@@ -24,10 +24,10 @@ DECLARE_GLOBAL_DATA_PTR;
struct unit_test_state global_dm_test_state;
static struct dm_test_state _global_priv_dm_test_state;
-/* Get ready for testing */
-static int dm_test_init(struct unit_test_state *uts, bool of_live)
+int dm_test_init(struct unit_test_state *uts)
{
struct dm_test_state *dms = uts->priv;
+ bool of_live = uts->of_live;
memset(dms, '\0', sizeof(*dms));
gd->dm_root = NULL;
@@ -70,7 +70,7 @@ static int dm_do_test(struct unit_test_state *uts, struct unit_test *test,
printf("Test: %s: %s%s\n", test->name, fname,
!of_live ? " (flat tree)" : "");
- ut_assertok(dm_test_init(uts, of_live));
+ uts->of_live = of_live;
ut_assertok(test_pre_run(uts, test));
diff --git a/test/test-main.c b/test/test-main.c
index 6f0d32f7e2..f14b7b09f7 100644
--- a/test/test-main.c
+++ b/test/test-main.c
@@ -30,6 +30,9 @@ static int do_autoprobe(struct unit_test_state *uts)
int test_pre_run(struct unit_test_state *uts, struct unit_test *test)
{
+ if (test->flags & UT_TESTF_DM)
+ ut_assertok(dm_test_init(uts));
+
ut_set_skip_delays(uts, false);
uts->start = mallinfo();
--
2.39.5