ztest: Add config to control test summary
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>
diff --git a/subsys/testsuite/ztest/Kconfig b/subsys/testsuite/ztest/Kconfig
index 7ebd385..fc2fa5c 100644
--- a/subsys/testsuite/ztest/Kconfig
+++ b/subsys/testsuite/ztest/Kconfig
@@ -146,6 +146,12 @@
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
bool "Verbose test output"
default y
diff --git a/subsys/testsuite/ztest/src/ztest_new.c b/subsys/testsuite/ztest/src/ztest_new.c
index 4d08211..3680948 100644
--- a/subsys/testsuite/ztest/src/ztest_new.c
+++ b/subsys/testsuite/ztest/src/ztest_new.c
@@ -64,8 +64,11 @@
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) {
TC_END_REPORT(TC_FAIL);
} else {
@@ -848,14 +851,15 @@
flush_log();
}
-#ifdef CONFIG_ZTEST_VERBOSE_SUMMARY
static void __ztest_show_suite_summary_verbose(struct ztest_suite_node *suite)
{
struct ztest_unit_test *test = NULL;
int tc_result = TC_PASS;
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)) {
if (test->stats->skip_count == test->stats->run_count) {
@@ -881,10 +885,12 @@
TC_SUMMARY_PRINT("\n");
flush_log();
}
-#endif
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
* is dropped if it goes through the logging subsystem.
*/
@@ -894,11 +900,8 @@
for (struct ztest_suite_node *ptr = _ztest_suite_node_list_start;
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);
-#endif
+ __ztest_show_suite_summary_verbose(ptr);
}
TC_SUMMARY_PRINT("------ TESTSUITE SUMMARY END ------\n\n");
flush_log();
@@ -909,10 +912,9 @@
struct ztest_suite_stats *stats = ptr->stats;
int count = 0;
- __ztest_init_unit_test_result_for_suite(ptr);
-
for (int i = 0; i < NUM_ITER_PER_SUITE; i++) {
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);
count++;
@@ -964,8 +966,6 @@
}
#endif
- __ztest_show_suite_summary();
-
return count;
}
