[igt-dev] [CI 1/5] lib: Print subtest starting/ending line to stderr too
From: Petri Latvala <hidden>
Date: 2018-06-13 11:36:23
Subsystem:
library code, the rest · Maintainers:
Andrew Morton, Linus Torvalds
when instructed via the environment. This is needed for the new test runner to properly assign stderr output to the correct subtest. v2: Print the subtest result from skip_subtests_henceforth handling also to stderr. Signed-off-by: Petri Latvala <redacted> --- lib/igt_core.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/lib/igt_core.c b/lib/igt_core.c
index 06d8b037..fe163bd8 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c@@ -305,6 +305,8 @@ GKeyFile *igt_key_file; char *igt_frame_dump_path; +static bool stderr_needs_sentinel = false; + const char *igt_test_name(void) { return command_str;
@@ -649,6 +651,8 @@ static void common_init_env(void) } igt_frame_dump_path = getenv("IGT_FRAME_DUMP_PATH"); + + stderr_needs_sentinel = getenv("IGT_SENTINEL_ON_STDERR") != NULL; } static int common_init(int *argc, char **argv,
@@ -927,12 +931,20 @@ bool __igt_run_subtest(const char *subtest_name) (!__igt_plain_output) ? "\x1b[1m" : "", subtest_name, skip_subtests_henceforth == SKIP ? "SKIP" : "FAIL", (!__igt_plain_output) ? "\x1b[0m" : ""); + fflush(stdout); + if (stderr_needs_sentinel) + fprintf(stderr, "Subtest %s: %s\n", subtest_name, + skip_subtests_henceforth == SKIP ? + "SKIP" : "FAIL"); return false; } igt_kmsg(KMSG_INFO "%s: starting subtest %s\n", command_str, subtest_name); - igt_debug("Starting subtest: %s\n", subtest_name); + igt_info("Starting subtest: %s\n", subtest_name); + fflush(stdout); + if (stderr_needs_sentinel) + fprintf(stderr, "Starting subtest: %s\n", subtest_name); _igt_log_buffer_reset();
@@ -987,6 +999,9 @@ static void exit_subtest(const char *result) in_subtest, result, time_elapsed(&subtest_time, &now), (!__igt_plain_output) ? "\x1b[0m" : ""); fflush(stdout); + if (stderr_needs_sentinel) + fprintf(stderr, "Subtest %s: %s (%.3fs)\n", + in_subtest, result, time_elapsed(&subtest_time, &now)); igt_terminate_spin_batches();
--
2.14.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev