[PATCH v8 18/18] perf test: Truncate printed test descriptions dynamically to avoid terminal wrapping

From: Ian Rogers

Date: Tue Jun 02 2026 - 13:47:49 EST


When test descriptions are extremely long (e.g., the truncated perf.data
graceful handling test is 103 characters long), they wrap across terminal
boundaries.

Because the ANSI escape code to delete the line (PERF_COLOR_DELETE_LINE)
only clears a single terminal line, visual wrapping leaves orphan
wrapped lines on the screen, which results in the test description being
printed multiple times.

Resolve this by checking the terminal width (get_term_dimensions) and
dynamically truncating the printed test description to fit within the
available columns, leaving safety space for the prefix index and status
suffix.

JUnit XML output and the failure summary report still print the full,
untruncated test descriptions.

Assisted-by: Gemini-CLI:Google Gemini 3
Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
---
tools/perf/tests/builtin-test.c | 63 +++++++++++++++++++++++++++++----
1 file changed, 56 insertions(+), 7 deletions(-)

diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index b64fc2204f22..edb4eaa695f1 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -20,6 +20,8 @@
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/time.h>
+#include <sys/ioctl.h>
+#include "util/term.h"
#include "builtin.h"
#include "config.h"
#include "hist.h"
@@ -404,19 +406,66 @@ static char *xml_escape(const char *str)
return res ? res : strdup("");
}

+static const char *format_test_description(const char *desc, int width, int max_desc_width,
+ char *buf, size_t buf_sz)
+{
+ int len = strlen(desc);
+
+ if (width > max_desc_width)
+ width = max_desc_width;
+
+ if (len > max_desc_width) {
+ snprintf(buf, buf_sz, "%.*s...", max_desc_width - 3, desc);
+ } else {
+ snprintf(buf, buf_sz, "%-*s", width, desc);
+ }
+ return buf;
+}
+
static int print_test_result(struct test_suite *t, int curr_suite, int curr_test_case,
int result, int width, int running,
const char *err_output, double elapsed)
{
+ char desc_buf[256];
+ const char *desc = test_description(t, curr_test_case);
+ struct winsize ws;
+ int max_desc_area_width;
+ int target_desc_area_width;
+ int desc_padding;
+
+ get_term_dimensions(&ws);
+ /*
+ * Total terminal columns minus space for status e.g. " Running (12 active)"
+ * which is 20 chars, plus a margin of 3 chars = 23 chars.
+ */
+ max_desc_area_width = ws.ws_col - 23;
+ if (max_desc_area_width < 40)
+ max_desc_area_width = 40;
+
+ /* Standard test has prefix "%3d: " which is 5 chars */
+ target_desc_area_width = width + 5;
+ if (target_desc_area_width > max_desc_area_width)
+ target_desc_area_width = max_desc_area_width;
+
if (test_suite__num_test_cases(t) > 1) {
char prefix[32];
int len = snprintf(prefix, sizeof(prefix), "%3d.%1d:",
curr_suite + 1, curr_test_case + 1);
- int subw = len >= 4 ? width + 4 - len : width;

- pr_info("%s %-*s:", prefix, subw, test_description(t, curr_test_case));
- } else
- pr_info("%3d: %-*s:", curr_suite + 1, width, test_description(t, curr_test_case));
+ desc_padding = target_desc_area_width - (len + 1);
+ if (desc_padding < 20)
+ desc_padding = 20;
+
+ format_test_description(desc, desc_padding, desc_padding, desc_buf, sizeof(desc_buf));
+ pr_info("%s %s:", prefix, desc_buf);
+ } else {
+ desc_padding = target_desc_area_width - 5;
+ if (desc_padding < 20)
+ desc_padding = 20;
+
+ format_test_description(desc, desc_padding, desc_padding, desc_buf, sizeof(desc_buf));
+ pr_info("%3d: %s:", curr_suite + 1, desc_buf);
+ }

switch (result) {
case TEST_RUNNING:
@@ -700,7 +749,7 @@ static void finish_test(struct child_test **child_tests, int running_test, int c
* sub test names.
*/
if (test_suite__num_test_cases(t) > 1 && curr_test_case == 0)
- pr_info("%3d: %-*s:\n", curr_suite + 1, width, test_description(t, -1));
+ pr_info("%3d: %s:\n", curr_suite + 1, test_description(t, -1));

/*
* Busy loop reading from the child's stdout/stderr that are set to be
@@ -976,7 +1025,7 @@ static int finish_tests_parallel(struct child_test **child_tests, size_t num_tes
if (next_child) {
if (test_suite__num_test_cases(next_child->test) > 1 &&
last_suite_printed != next_child->suite_num) {
- pr_info("%3d: %-*s:\n", next_child->suite_num + 1, width,
+ pr_info("%3d: %s:\n", next_child->suite_num + 1,
test_description(next_child->test, -1));
last_suite_printed = next_child->suite_num;
}
@@ -1040,7 +1089,7 @@ static int finish_tests_parallel(struct child_test **child_tests, size_t num_tes

if (test_suite__num_test_cases(child->test) > 1 &&
last_suite_printed != child->suite_num) {
- pr_info("%3d: %-*s:\n", child->suite_num + 1, width,
+ pr_info("%3d: %s:\n", child->suite_num + 1,
test_description(child->test, -1));
last_suite_printed = child->suite_num;
}
--
2.54.0.1013.g208068f2d8-goog