From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B871F346769 for ; Sun, 31 May 2026 06:38:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780209495; cv=none; b=Dlo+JjSMtgA8usny0rNNua0O227JKZT/pgn4THU162VlMfMhxAzv4fBPuq/R9ToML4etWy6WMzDcU2pVdr+3qemCJucsUOhhlL9W0RthdlasjurSwT67pSnHnp78DTEFd3bE2J1pC1N40u7kgvel1taK6Ot+3zqRnuQMy4w7F3A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780209495; c=relaxed/simple; bh=uLld3+uwOCg40ZO/4xygF3vwIqly1oKARTE8eN08oMI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hdrG+D50mLnEnv+EFmeg5pT7wsB+4Px36l9Ze8q7JZz/rf8kDcIPFvOfIPO44hGr3N8lFlFbhFdwnDCsfxKXFMVI58PIKpP444rE50WzNgZhsUw6M1VdGY0MqVdJpzdMtfBqRKGMLSjNNz3Y/gIOVlwD64CSPvbt5tuWChDlZT0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=rsOfa/8g; arc=none smtp.client-ip=74.125.82.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rsOfa/8g" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-304f1820babso2488210eec.1 for ; Sat, 30 May 2026 23:38:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780209489; x=1780814289; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=MXre2okYx3MjQdUqAJ2nIZgNcGxZc3YS3uUa9O3ZGec=; b=rsOfa/8gXTTdM/GRlri1nXmp0HS/c6igQ6eg5RSGux3mtQ23LFrxk46Lpw7uQywhQ6 RCVFYqCpFdiB6h8hdGMr4++m2d0++z+AWJmxutybAv2+a40z5aRpsvGCZuEhmpgtr3V8 1caNAzJFmFsUMWTeHv02K0juyuFTQN0nEi0fuUcej1HnQ8SYtzEn+8jvChdPJRhoxKf3 gKgiyZ3RYe8eu+ZSgY26GTCcIZ2PV2B/fuB0zaZhIUSXxkh3itbO59bE9Fg7Gi56u520 Kwv0MYQiIb7YPPQM4YOiEsWmGa1V0m6vcD/vlJwLuGENwaHLYMMliKhKeEgpt+1rC4jd g9gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780209489; x=1780814289; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MXre2okYx3MjQdUqAJ2nIZgNcGxZc3YS3uUa9O3ZGec=; b=ZD6vaxf+rMnX4itmANwHknjSUWk7xL/k7bUiUo3QaBzIKy5mVkCBNXDQfmo5Wtm+hg cYiyrjx4oS/OycdPBseFe7n9mmKHvvkc1eueZeXWRyubImUgTu4MZnmPbaDC59EETZMj fIA0Cj/QjnqdI9XytVtRIdybOz+alXPpjxkq2zi2gPzq7X0BCVpuVXWcY0dCd9NWzjky dDKWjiopug/yPOs9TH1zAkWP1JC0sHNqV5tCLi865eZfisJ3m+c1taMe5JskOx05eOUz ZZGrmYGTGAycBSfiTQ+PHLP9IFFL22/zF2RWznK/G/nqRP8Hx1vp7+AvfW7GjVfvcEsA aLHw== X-Forwarded-Encrypted: i=1; AFNElJ8eCRaBX2sxu3rDRpsCigpgeIjHdKJnEpXpUFKqxvhJCJ4jR7joB9jGhqkSQlJ8exvKPEd4DxXMjEXvLY0=@vger.kernel.org X-Gm-Message-State: AOJu0YwfGFceX5YcbN+23v7be53mh7R7i5xrX2A8j4c2Rc/M031KKziD QHK3eMK68CH9BFRbC6r7Ksu6sy6IjDU5Y9wnvOTsvdaMOIvWtC9eJFtKfLzF1Crtd5yujydEqX7 DbLtMjJBKYA== X-Received: from dlbrl23.prod.google.com ([2002:a05:7022:f517:b0:136:e690:f3e9]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:72c5:b0:2f2:6dde:df66 with SMTP id 5a478bee46e88-304fa628f82mr3023492eec.22.1780209488641; Sat, 30 May 2026 23:38:08 -0700 (PDT) Date: Sat, 30 May 2026 23:37:32 -0700 In-Reply-To: <20260531063736.871777-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260531052740.796087-1-irogers@google.com> <20260531063736.871777-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.823.g6e5bcc1fc9-goog Message-ID: <20260531063736.871777-11-irogers@google.com> Subject: [PATCH v3 10/14] perf test: Skip shebang and SPDX comments in shell test descriptions From: Ian Rogers To: irogers@google.com, acme@kernel.org, adrian.hunter@intel.com, namhyung@kernel.org Cc: alexander.shishkin@linux.intel.com, james.clark@linaro.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org Content-Type: text/plain; charset="UTF-8" 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 --- tools/perf/tests/tests-scripts.c | 66 +++++++++++++++++--------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/tools/perf/tests/tests-scripts.c b/tools/perf/tests/tests-scripts.c index f18c4cd337c8..11ad1263ef85 100644 --- a/tools/perf/tests/tests-scripts.c +++ b/tools/perf/tests/tests-scripts.c @@ -51,7 +51,7 @@ static int shell_tests__dir_fd(void) return -1; /* Follow another level of symlink if there */ if (lstat(path2, &st) == 0 && (st.st_mode & S_IFMT) == S_IFLNK) { - scnprintf(path, sizeof(path), path2); + scnprintf(path, sizeof(path), "%s", path2); if (readlink(path, path2, sizeof path2) < 0) return -1; } @@ -78,43 +78,49 @@ 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.823.g6e5bcc1fc9-goog