test: Move do_autoprobe() to test_pre_run()

Move this step over to the pre-run function.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/test/dm/test-dm.c b/test/dm/test-dm.c
index 4cb0da13b7cb04409bdc26cb9059c11444ad01d2..c2e1a1b9207b73da0cd8586fcb2fff07ab2926b8 100644 (file)
--- a/test/dm/test-dm.c
+++ b/test/dm/test-dm.c
@@ -43,21 +43,6 @@ static int dm_test_init(struct unit_test_state *uts, bool of_live)
        return 0;
 }
 
-/* Ensure all the test devices are probed */
-static int do_autoprobe(struct unit_test_state *uts)
-{
-       struct udevice *dev;
-       int ret;
-
-       /* Scanning the uclass is enough to probe all the devices */
-       for (ret = uclass_first_device(UCLASS_TEST, &dev);
-            dev;
-            ret = uclass_next_device(&dev))
-               ;
-
-       return ret;
-}
-
 static int dm_test_destroy(struct unit_test_state *uts)
 {
        int id;
@@ -91,8 +76,6 @@ static int dm_do_test(struct unit_test_state *uts, struct unit_test *test,
        uts->start = mallinfo();
        if (test->flags & UT_TESTF_SCAN_PDATA)
                ut_assertok(dm_scan_plat(false));
-       if (test->flags & UT_TESTF_PROBE_TEST)
-               ut_assertok(do_autoprobe(uts));
 
        ut_assertok(test_pre_run(uts, test));
 

diff --git a/test/test-main.c b/test/test-main.c
index a971fe0e9c86771698b2153b9a5729af84624c57..bd2f08a2b42a32091d26194b0bc22f9365ee7863 100644 (file)
--- a/test/test-main.c
+++ b/test/test-main.c
@@ -13,12 +13,30 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+/* Ensure all the test devices are probed */
+static int do_autoprobe(struct unit_test_state *uts)
+{
+       struct udevice *dev;
+       int ret;
+
+       /* Scanning the uclass is enough to probe all the devices */
+       for (ret = uclass_first_device(UCLASS_TEST, &dev);
+            dev;
+            ret = uclass_next_device(&dev))
+               ;
+
+       return ret;
+}
+
 int test_pre_run(struct unit_test_state *uts, struct unit_test *test)
 {
        /* DM tests have already done this */
        if (!(test->flags & UT_TESTF_DM))
                uts->start = mallinfo();
 
+       if (test->flags & UT_TESTF_PROBE_TEST)
+               ut_assertok(do_autoprobe(uts));
+
        if (!CONFIG_IS_ENABLED(OF_PLATDATA) &&
            (test->flags & UT_TESTF_SCAN_FDT))
                ut_assertok(dm_extended_scan(false));