Merge pull request #124 from pks-gitlab/pks-print-drop-suite-names

pks-t · web-flow · commit af2beb99a511 · 2025-09-22T13:42:27.000+02:00
clar/print: drop unused suite names
diff --git a/clar.c b/clar.c
@@ -195,7 +195,7 @@ struct clar_suite {
 };
 
 /* From clar_print_*.c */
-static void clar_print_init(int test_count, int suite_count, const char *suite_names);
+static void clar_print_init(int test_count, int suite_count);
 static void clar_print_shutdown(int test_count, int suite_count, int error_count);
 static void clar_print_error(int num, const struct clar_report *report, const struct clar_error *error);
 static void clar_print_ontest(const char *suite_name, const char *test_name, int test_number, enum cl_test_status failed);
@@ -592,11 +592,7 @@ clar_test_init(int argc, char **argv)
 	if (argc > 1)
 		clar_parse_args(argc, argv);
 
-	clar_print_init(
-		(int)_clar_callback_count,
-		(int)_clar_suite_count,
-		""
-	);
+	clar_print_init((int)_clar_callback_count, (int)_clar_suite_count);
 
 	if (!_clar.summary_filename &&
 	    (summary_env = getenv("CLAR_SUMMARY")) != NULL) {
diff --git a/clar/print.h b/clar/print.h
@@ -1,13 +1,13 @@
 /* clap: clar protocol, the traditional clar output format */
 
-static void clar_print_clap_init(int test_count, int suite_count, const char *suite_names)
+static void clar_print_clap_init(int test_count, int suite_count)
 {
 	(void)test_count;
 
 	if (_clar.verbosity < 0)
 		return;
 
-	printf("Loaded %d suites: %s\n", (int)suite_count, suite_names);
+	printf("Loaded %d suites:\n", (int)suite_count);
 	printf("Started (test status codes: OK='.' FAILURE='F' SKIPPED='S')\n");
 }
 
@@ -103,11 +103,10 @@ static void clar_print_clap_onabort(const char *fmt, va_list arg)
 
 /* tap: test anywhere protocol format */
 
-static void clar_print_tap_init(int test_count, int suite_count, const char *suite_names)
+static void clar_print_tap_init(int test_count, int suite_count)
 {
 	(void)test_count;
 	(void)suite_count;
-	(void)suite_names;
 	printf("TAP version 13\n");
 }
 
@@ -207,9 +206,9 @@ static void clar_print_tap_onabort(const char *fmt, va_list arg)
 		} \
 	} while (0)
 
-static void clar_print_init(int test_count, int suite_count, const char *suite_names)
+static void clar_print_init(int test_count, int suite_count)
 {
-	PRINT(init, test_count, suite_count, suite_names);
+	PRINT(init, test_count, suite_count);
 }
 
 static void clar_print_shutdown(int test_count, int suite_count, int error_count)
diff --git a/test/expected/specific_test b/test/expected/specific_test
@@ -1,4 +1,4 @@
-Loaded 1 suites: 
+Loaded 1 suites:
 Started (test status codes: OK='.' FAILURE='F' SKIPPED='S')
 F
 
diff --git a/test/expected/stop_on_failure b/test/expected/stop_on_failure
@@ -1,4 +1,4 @@
-Loaded 1 suites: 
+Loaded 1 suites:
 Started (test status codes: OK='.' FAILURE='F' SKIPPED='S')
 F
 
diff --git a/test/expected/summary_with_filename b/test/expected/summary_with_filename
@@ -1,4 +1,4 @@
-Loaded 1 suites: 
+Loaded 1 suites:
 Started (test status codes: OK='.' FAILURE='F' SKIPPED='S')
 FFFFFFFFFF
 
diff --git a/test/expected/summary_without_filename b/test/expected/summary_without_filename
@@ -1,4 +1,4 @@
-Loaded 1 suites: 
+Loaded 1 suites:
 Started (test status codes: OK='.' FAILURE='F' SKIPPED='S')
 FFFFFFFFFF
 
diff --git a/test/expected/without_arguments b/test/expected/without_arguments
@@ -1,4 +1,4 @@
-Loaded 1 suites: 
+Loaded 1 suites:
 Started (test status codes: OK='.' FAILURE='F' SKIPPED='S')
 FFFFFFFFFF
 

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`/* clap: clar protocol, the traditional clar output format */`
`2`	`2`
`3`		`-static void clar_print_clap_init(int test_count, int suite_count, const char *suite_names)`
	`3`	`+static void clar_print_clap_init(int test_count, int suite_count)`
`4`	`4`	`{`
`5`	`5`	`(void)test_count;`
`6`	`6`
`7`	`7`	`if (_clar.verbosity < 0)`
`8`	`8`	`return;`
`9`	`9`
`10`		`- printf("Loaded %d suites: %s\n", (int)suite_count, suite_names);`
	`10`	`+ printf("Loaded %d suites:\n", (int)suite_count);`
`11`	`11`	`printf("Started (test status codes: OK='.' FAILURE='F' SKIPPED='S')\n");`
`12`	`12`	`}`
`13`	`13`
`@@ -103,11 +103,10 @@ static void clar_print_clap_onabort(const char *fmt, va_list arg)`
`103`	`103`
`104`	`104`	`/* tap: test anywhere protocol format */`
`105`	`105`
`106`		`-static void clar_print_tap_init(int test_count, int suite_count, const char *suite_names)`
	`106`	`+static void clar_print_tap_init(int test_count, int suite_count)`
`107`	`107`	`{`
`108`	`108`	`(void)test_count;`
`109`	`109`	`(void)suite_count;`
`110`		`- (void)suite_names;`
`111`	`110`	`printf("TAP version 13\n");`
`112`	`111`	`}`
`113`	`112`
`@@ -207,9 +206,9 @@ static void clar_print_tap_onabort(const char *fmt, va_list arg)`
`207`	`206`	`} \`
`208`	`207`	`} while (0)`
`209`	`208`
`210`		`-static void clar_print_init(int test_count, int suite_count, const char *suite_names)`
	`209`	`+static void clar_print_init(int test_count, int suite_count)`
`211`	`210`	`{`
`212`		`- PRINT(init, test_count, suite_count, suite_names);`
	`211`	`+ PRINT(init, test_count, suite_count);`
`213`	`212`	`}`
`214`	`213`
`215`	`214`	`static void clar_print_shutdown(int test_count, int suite_count, int error_count)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Loaded 1 suites:`
	`1`	`+Loaded 1 suites:`
`2`	`2`	`Started (test status codes: OK='.' FAILURE='F' SKIPPED='S')`
`3`	`3`	`F`
`4`	`4`