michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ztest: Add config to control test summary

Browse source 
Test summary can add a lot of noise to the logs when debugging
a specific test using `-test` argument.
Add control to turn this off.

Signed-off-by: Al Semjonovs <asemjonovs@google.com>
This commit is contained in:
Al Semjonovs 2022-10-04 09:18:07 -06:00 • committed by Anas Nashif
commit da23050812
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/testsuite/ztest/Kconfig
View file

@ -146,6 +146,12 @@ config ZTEST_SHUFFLE_TEST_REPEAT_COUNT
endif #ZTEST_SHUFFLE endif #ZTEST_SHUFFLE
config ZTEST_SUMMARY
bool "Display test summary"
default y
help
This option controls output of a test summary.
config ZTEST_VERBOSE_OUTPUT config ZTEST_VERBOSE_OUTPUT
bool "Verbose test output" bool "Verbose test output"
default y default y

24
subsys/testsuite/ztest/src/ztest_new.c
View file

@ -64,8 +64,11 @@ static ZTEST_BMEM enum ztest_status test_status = ZTEST_STATUS_OK;
extern ZTEST_DMEM const struct ztest_arch_api ztest_api; extern ZTEST_DMEM const struct ztest_arch_api ztest_api;
void end_report(void) static void __ztest_show_suite_summary(void);
static void end_report(void)
{ {
__ztest_show_suite_summary();
if (test_status) { if (test_status) {
TC_END_REPORT(TC_FAIL); TC_END_REPORT(TC_FAIL);
} else { } else {
@ -848,14 +851,15 @@ static void __ztest_show_suite_summary_oneline(struct ztest_suite_node *suite)
flush_log(); flush_log();
} }
#ifdef CONFIG_ZTEST_VERBOSE_SUMMARY
static void __ztest_show_suite_summary_verbose(struct ztest_suite_node *suite) static void __ztest_show_suite_summary_verbose(struct ztest_suite_node *suite)
{ {
struct ztest_unit_test *test = NULL; struct ztest_unit_test *test = NULL;
int tc_result = TC_PASS; int tc_result = TC_PASS;
int flush_frequency = 0; int flush_frequency = 0;
__ztest_show_suite_summary_oneline(suite); if (IS_ENABLED(CONFIG_ZTEST_VERBOSE_SUMMARY) == 0) {
return;
}
while (((test = z_ztest_get_next_test(suite->name, test)) != NULL)) { while (((test = z_ztest_get_next_test(suite->name, test)) != NULL)) {
if (test->stats->skip_count == test->stats->run_count) { if (test->stats->skip_count == test->stats->run_count) {
@ -881,10 +885,12 @@ static void __ztest_show_suite_summary_verbose(struct ztest_suite_node *suite)
TC_SUMMARY_PRINT("\n"); TC_SUMMARY_PRINT("\n");
flush_log(); flush_log();
} }
#endif
static void __ztest_show_suite_summary(void) static void __ztest_show_suite_summary(void)
{ {
if (IS_ENABLED(CONFIG_ZTEST_SUMMARY) == 0) {
return;
}
/* Flush the log a lot to ensure that no summary content /* Flush the log a lot to ensure that no summary content
* is dropped if it goes through the logging subsystem. * is dropped if it goes through the logging subsystem.
*/ */
@ -894,11 +900,8 @@ static void __ztest_show_suite_summary(void)
for (struct ztest_suite_node *ptr = _ztest_suite_node_list_start; for (struct ztest_suite_node *ptr = _ztest_suite_node_list_start;
ptr < _ztest_suite_node_list_end; ++ptr) { ptr < _ztest_suite_node_list_end; ++ptr) {
#ifdef CONFIG_ZTEST_VERBOSE_SUMMARY
__ztest_show_suite_summary_verbose(ptr);
#else
__ztest_show_suite_summary_oneline(ptr); __ztest_show_suite_summary_oneline(ptr);
#endif __ztest_show_suite_summary_verbose(ptr);
} }
TC_SUMMARY_PRINT("------ TESTSUITE SUMMARY END ------\n\n"); TC_SUMMARY_PRINT("------ TESTSUITE SUMMARY END ------\n\n");
flush_log(); flush_log();
@ -909,10 +912,9 @@ static int __ztest_run_test_suite(struct ztest_suite_node *ptr, const void *stat
struct ztest_suite_stats *stats = ptr->stats; struct ztest_suite_stats *stats = ptr->stats;
int count = 0; int count = 0;
__ztest_init_unit_test_result_for_suite(ptr);
for (int i = 0; i < NUM_ITER_PER_SUITE; i++) { for (int i = 0; i < NUM_ITER_PER_SUITE; i++) {
if (ztest_api.should_suite_run(state, ptr)) { if (ztest_api.should_suite_run(state, ptr)) {
__ztest_init_unit_test_result_for_suite(ptr);
int fail = z_ztest_run_test_suite_ptr(ptr); int fail = z_ztest_run_test_suite_ptr(ptr);
count++; count++;
@ -964,8 +966,6 @@ int z_impl_ztest_run_test_suites(const void *state)
} }
#endif #endif
__ztest_show_suite_summary();
return count; return count;
} }