From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
James Clark <james.clark@linaro.org>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org
Cc: Ian Rogers <irogers@google.com>
Subject: [PATCH v1 10/14] perf test: Skip shebang and SPDX comments in shell test descriptions
Date: Wed, 13 May 2026 16:04:46 -0700 [thread overview]
Message-ID: <20260513230450.529380-11-irogers@google.com> (raw)
In-Reply-To: <20260513230450.529380-1-irogers@google.com>
When extracting shell test descriptions in tests-scripts.c, the parser
skipped the first line assuming it was the shebang (#!/bin/sh) and then read
the first comment line on line 2 as the test description.
However, checkpatch.pl expects shell scripts to declare their SPDX license
identifier on line 2 (# SPDX-License-Identifier: ...). This caused the test
harness to extract the SPDX license string as the test description.
Refactor shell_test__description to use io__getline, skipping both shebang
and SPDX comment lines. This allows shell tests to include standard SPDX
headers without breaking test suite description extraction.
Assisted-by: Gemini-CLI:Google Gemini 3
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/tests/tests-scripts.c | 63 +++++++++++++++++---------------
1 file changed, 34 insertions(+), 29 deletions(-)
diff --git a/tools/perf/tests/tests-scripts.c b/tools/perf/tests/tests-scripts.c
index f18c4cd337c8..48f28cb80db7 100644
--- a/tools/perf/tests/tests-scripts.c
+++ b/tools/perf/tests/tests-scripts.c
@@ -78,43 +78,48 @@ static int shell_tests__dir_fd(void)
static char *shell_test__description(int dir_fd, const char *name)
{
struct io io;
- char buf[128], desc[256];
- int ch, pos = 0;
+ char buf[128], *line = NULL;
+ size_t line_len = 0;
+ ssize_t len;
+ char *desc = NULL;
io__init(&io, openat(dir_fd, name, O_RDONLY), buf, sizeof(buf));
if (io.fd < 0)
return NULL;
- /* Skip first line - should be #!/bin/bash Shebang */
- if (io__get_char(&io) != '#')
- goto err_out;
- if (io__get_char(&io) != '!')
- goto err_out;
- do {
- ch = io__get_char(&io);
- if (ch < 0)
- goto err_out;
- } while (ch != '\n');
-
- do {
- ch = io__get_char(&io);
- if (ch < 0)
- goto err_out;
- } while (ch == '#' || isspace(ch));
- while (ch > 0 && ch != '\n') {
- desc[pos++] = ch;
- if (pos >= (int)sizeof(desc) - 1)
+ while ((len = io__getline(&io, &line, &line_len)) > 0) {
+ char *p = line;
+
+ /* Skip leading whitespace */
+ while (*p && isspace(*p))
+ p++;
+
+ /* Must be a comment */
+ if (*p != '#')
+ continue;
+ p++;
+
+ /* Skip shebang or SPDX lines */
+ if (*p == '!' || strstr(p, "SPDX-License-Identifier:"))
+ continue;
+
+ /* Skip whitespace after # */
+ while (*p && isspace(*p))
+ p++;
+
+ /* If we found non-empty text, this is the description! */
+ if (*p && *p != '\n') {
+ char *end = p + strlen(p);
+ while (end > p && isspace(end[-1]))
+ end--;
+ *end = '\0';
+ desc = strdup(p);
break;
- ch = io__get_char(&io);
+ }
}
- while (pos > 0 && isspace(desc[--pos]))
- ;
- desc[++pos] = '\0';
- close(io.fd);
- return strdup(desc);
-err_out:
+ free(line);
close(io.fd);
- return NULL;
+ return desc;
}
/* Is this full file path a shell script */
--
2.54.0.563.g4f69b47b94-goog
next prev parent reply other threads:[~2026-05-13 23:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-13 23:04 [PATCH v1 00/14] perf test: Harness improvements Ian Rogers
2026-05-13 23:04 ` [PATCH v1 01/14] perf jevents.py: Make generated C code more kernel style Ian Rogers
2026-05-13 23:04 ` [PATCH v1 02/14] perf pmu-events: Add API to get metric table name and iterate tables Ian Rogers
2026-05-13 23:04 ` [PATCH v1 03/14] perf test: Drain pipe after child finishes to avoid losing output Ian Rogers
2026-05-13 23:04 ` [PATCH v1 04/14] perf test: Support dynamic test suites with setup callback and private data Ian Rogers
2026-05-13 23:04 ` [PATCH v1 05/14] perf test pmu-events: A sub-test per metric table Ian Rogers
2026-05-13 23:04 ` [PATCH v1 06/14] perf test: Refactor parallel poll loop to drain all pipes simultaneously Ian Rogers
2026-05-13 23:04 ` [PATCH v1 07/14] perf test: Show snippet failure output for verbose=1 Ian Rogers
2026-05-13 23:04 ` [PATCH v1 08/14] perf test: Add summary reporting Ian Rogers
2026-05-13 23:04 ` [PATCH v1 09/14] perf test: Fix subtest status alignment for multi-digit indexes Ian Rogers
2026-05-13 23:04 ` Ian Rogers [this message]
2026-05-13 23:04 ` [PATCH v1 11/14] perf test: Split monolithic 'util' test suite into sub-tests Ian Rogers
2026-05-13 23:04 ` [PATCH v1 12/14] perf test: Add -j/--junit option for JUnit XML test reports Ian Rogers
2026-05-13 23:04 ` [PATCH v1 13/14] perf test: Add shell test to validate JUnit XML reporting output Ian Rogers
2026-05-13 23:04 ` [PATCH v1 14/14] perf test: Remove /usr/bin/cc dependency from Intel PT shell test Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260513230450.529380-11-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=james.clark@linaro.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox