diff options
| author | Simon Glass <sjg@chromium.org> | 2015-11-08 23:47:50 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-11-19 20:27:51 -0700 |
| commit | 9ce8b40206f4f96de6164c2a0c0a725c9323c4b9 (patch) | |
| tree | 97b5a359149976a31ca4e5b273ea945dd62280b1 /test/dm | |
| parent | 61b4d3558e9236ee9554a0da65f8ce139cbd3560 (diff) | |
| download | talos-obmc-uboot-9ce8b40206f4f96de6164c2a0c0a725c9323c4b9.tar.gz talos-obmc-uboot-9ce8b40206f4f96de6164c2a0c0a725c9323c4b9.zip | |
test: Record and silence console in tests
When running sandbox tests, silence the console to avoid unwanted output.
Also, record the console in case tests want to check it.
The -v option can be used to enable stdout during tests.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'test/dm')
| -rw-r--r-- | test/dm/test-main.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/test/dm/test-main.c b/test/dm/test-main.c index 867b5177e0..91bdda83ab 100644 --- a/test/dm/test-main.c +++ b/test/dm/test-main.c @@ -76,6 +76,7 @@ static int dm_test_main(const char *test_name) struct unit_test *tests = ll_entry_start(struct unit_test, dm_test); const int n_ents = ll_entry_count(struct unit_test, dm_test); struct unit_test_state *uts = &global_dm_test_state; + struct sandbox_state *state = state_get_current(); uts->priv = &_global_priv_dm_test_state; struct unit_test *test; int run_count; @@ -114,7 +115,15 @@ static int dm_test_main(const char *test_name) if (test->flags & DM_TESTF_SCAN_FDT) ut_assertok(dm_scan_fdt(gd->fdt_blob, false)); + /* + * Silence the console and rely on console reocrding to get + * our output. + */ + console_record_reset(); + if (!state->show_test_output) + gd->flags |= GD_FLG_SILENT; test->func(uts); + gd->flags &= ~GD_FLG_SILENT; state_set_skip_delays(false); ut_assertok(dm_test_destroy(uts)); |
