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>

diff --git a/include/test/test.h b/include/test/test.h
index d282cb2362d74dd30d22b3fbdb79668a7b219822..6997568cc0762a4fa6f39c9b84e36b21c8acdd4b 100644 (file)
--- 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 e5ec18e60b0d2c8cab8147748961a2defd46b2c3..6e56ca99c31087b5b45051f968008cb494b14c6d 100644 (file)
--- 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 569ffbbad934785f8346619c65df412c7924bf27..ceeac3fd361800b51982c26f49727b317f75399b 100644 (file)
--- 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 6f0d32f7e2762b406b1028d8bc214eb9b93659cd..f14b7b09f79f08c340c34304c463025a71a33338 100644 (file)
--- 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();