test: Move delay skipping to test_pre_run()

This allows delays to be skipped in sandbox tests. Move it to the
common pre-init function.

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

diff --git a/include/test/ut.h b/include/test/ut.h
index 7cb5e10..e5ec18e 100644 (file)
--- a/include/test/ut.h
+++ b/include/test/ut.h
@@ -357,6 +357,17 @@ void ut_silence_console(struct unit_test_state *uts);
 void ut_unsilence_console(struct unit_test_state *uts);
 
 /**
+ * ut_set_skip_delays() - Sets whether delays should be skipped
+ *
+ * Normally functions like mdelay() cause U-Boot to wait for a while. This
+ * allows all such delays to be skipped on sandbox, to speed up tests
+ *
+ * @uts: Test state (in case in future we want to keep state here)
+ * @skip_delays: true to skip delays, false to process them normally
+ */
+void ut_set_skip_delays(struct unit_test_state *uts, bool skip_delays);
+
+/**
  * test_pre_run() - Handle any preparation needed to run a test
  *
  * @uts: Test state

diff --git a/test/dm/test-dm.c b/test/dm/test-dm.c
index fdd35f6..569ffbb 100644 (file)
--- a/test/dm/test-dm.c
+++ b/test/dm/test-dm.c
@@ -78,8 +78,6 @@ static int dm_do_test(struct unit_test_state *uts, struct unit_test *test,
 
        ut_assertok(test_post_run(uts, test));
 
-       state_set_skip_delays(false);
-
        ut_assertok(dm_test_destroy(uts));
 
        return 0;

diff --git a/test/test-main.c b/test/test-main.c
index e273777..6f0d32f 100644 (file)
--- a/test/test-main.c
+++ b/test/test-main.c
@@ -30,6 +30,8 @@ static int do_autoprobe(struct unit_test_state *uts)
 
 int test_pre_run(struct unit_test_state *uts, struct unit_test *test)
 {
+       ut_set_skip_delays(uts, false);
+
        uts->start = mallinfo();
 
        if (test->flags & UT_TESTF_SCAN_PDATA)

diff --git a/test/ut.c b/test/ut.c
index 7328338..ea0af15 100644 (file)
--- a/test/ut.c
+++ b/test/ut.c
@@ -133,3 +133,10 @@ void ut_unsilence_console(struct unit_test_state *uts)
 {
        gd->flags &= ~(GD_FLG_SILENT | GD_FLG_RECORD);
 }
+
+void ut_set_skip_delays(struct unit_test_state *uts, bool skip_delays)
+{
+#ifdef CONFIG_SANDBOX
+       state_set_skip_delays(skip_delays);
+#endif
+}