Commit 107bf1f4be045fa1f8f2fe649c0b3d97c8d39d5a
2020-06-03T11:47:13
clar: print indirection
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88
diff --git a/tests/clar/print.h b/tests/clar/print.h
index 2e2b620..5c8857c 100644
--- a/tests/clar/print.h
+++ b/tests/clar/print.h
@@ -1,12 +1,12 @@
-static void clar_print_init(int test_count, int suite_count, const char *suite_names)
+static void clar_print_cl_init(int test_count, int suite_count, const char *suite_names)
{
(void)test_count;
printf("Loaded %d suites: %s\n", (int)suite_count, suite_names);
printf("Started (test status codes: OK='.' FAILURE='F' SKIPPED='S')\n");
}
-static void clar_print_shutdown(int test_count, int suite_count, int error_count)
+static void clar_print_cl_shutdown(int test_count, int suite_count, int error_count)
{
(void)test_count;
(void)suite_count;
@@ -16,7 +16,7 @@ static void clar_print_shutdown(int test_count, int suite_count, int error_count
clar_report_all();
}
-static void clar_print_error(int num, const struct clar_report *report, const struct clar_error *error)
+static void clar_print_cl_error(int num, const struct clar_report *report, const struct clar_error *error)
{
printf(" %d) Failure:\n", num);
@@ -35,7 +35,7 @@ static void clar_print_error(int num, const struct clar_report *report, const st
fflush(stdout);
}
-static void clar_print_ontest(const char *test_name, int test_number, enum cl_test_status status)
+static void clar_print_cl_ontest(const char *test_name, int test_number, enum cl_test_status status)
{
(void)test_name;
(void)test_number;
@@ -50,7 +50,7 @@ static void clar_print_ontest(const char *test_name, int test_number, enum cl_te
fflush(stdout);
}
-static void clar_print_onsuite(const char *suite_name, int suite_index)
+static void clar_print_cl_onsuite(const char *suite_name, int suite_index)
{
if (_clar.report_suite_names)
printf("\n%s", suite_name);
@@ -58,10 +58,40 @@ static void clar_print_onsuite(const char *suite_name, int suite_index)
(void)suite_index;
}
+static void clar_print_cl_onabort(const char *fmt, va_list arg)
+{
+ vfprintf(stderr, fmt, arg);
+}
+
+static void clar_print_init(int test_count, int suite_count, const char *suite_names)
+{
+ clar_print_cl_init(test_count, suite_count, suite_names);
+}
+
+static void clar_print_shutdown(int test_count, int suite_count, int error_count)
+{
+ clar_print_cl_shutdown(test_count, suite_count, error_count);
+}
+
+static void clar_print_error(int num, const struct clar_report *report, const struct clar_error *error)
+{
+ clar_print_cl_error(num, report, error);
+}
+
+static void clar_print_ontest(const char *test_name, int test_number, enum cl_test_status status)
+{
+ clar_print_cl_ontest(test_name, test_number, status);
+}
+
+static void clar_print_onsuite(const char *suite_name, int suite_index)
+{
+ clar_print_cl_onsuite(suite_name, suite_index);
+}
+
static void clar_print_onabort(const char *msg, ...)
{
va_list argp;
va_start(argp, msg);
- vfprintf(stderr, msg, argp);
+ clar_print_cl_onabort(msg, argp);
va_end(argp);
}