From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.214.200 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794307923; b=HRc+s2DDP98mVE5EbVZBRf2wUr+9lGlibnURlWLLEuHVvFmntjk4DA3uP1M3BQSGWVdw 4gq2hWw234K3FL3tWhZ4AZsLZYxYuUApJ3oo+eaPNiZFXdxnjaY5/umTyL2WU9KTM2RyQ jC3I3PUoU/DdY+Yr+JPtLsy4sv2heFCOYZ6iyY8lFU6MaNv9sy8TX/U9WBcfZ3DUiborv etbi5vqlI1/HQqXh803PC3UNSARbXN7Q4oVRaSq3rv5RDPzYweo34URW0SQasaN9wNzgL XduZiatPN18BJIr1j37GtUINWuQ5jyOWDSTezAP/80pVdcEmq7I5BFsVp4EZaHBUJeQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794307923; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=luY53rQnSHqOmqiVXG3ojpIoE98d8W8aTwUr99JyWqc=; b=krG5du7WD5v7w637YBlaanceV+FPk4Ur0Lr/ftALEc53J9yJthx/mN8CgKwPwd9SNHi0 /TxH8/qwQBzhCBZg7TjsH7zPy0hLHXMKhhlBseCfe+tviqHESv3ejPvW/mFOWSFBmAVPf uv3g8lRgF7PIGdyxg8G/GKOdLSpetjQZ02laA2GQ8DDOKSZs+J7SNGwIEEDODiqldUyFp qYrE5Y2VZL0rq7xvLypo0VpMKnAL5Uu/rvknYdw713lfseUE6x7sk9PV8FJvr9WHfAfys sAvBzmER0aAjef8DqwK3ru+Ku1iw8yVlqYHEyYSR+OznGs+7o86m/Upi/9p+iPdD7dQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--wakel.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=NcRlXcf5; arc=none smtp.remote-ip=209.85.214.200 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8CE00606A321 for ; Tue, 10 Nov 2026 10:52:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 8CE00606A321 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--wakel.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=NcRlXcf5 Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2ed1fbae872so27801535ad.2 for ; Tue, 10 Nov 2026 02:52:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794307923; x=1794912723; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=luY53rQnSHqOmqiVXG3ojpIoE98d8W8aTwUr99JyWqc=; b=NcRlXcf58L5cAm85xdwcRMP8p/gxpVW0B3VFJ8usn+Fv0oeYo7gKsPhzp/NOm7FFfn F1frWF9UacFCIYy7+uO6/e3rXu0yXIbTev4FjE7N+3HYbWJn4T4jIYrpcj6hnLZQXqcD jZrM4Qm0pFmQoIlaMiuFv8uGsuVg04jHZY7RhgYpcCuEjJLBc5WnZVvR1l4JwQpN4wGO MjDcz6jZyUQLEqfqbWV5Oo4YooBz2Fl0qruAepfk2QuGXsfwE5RQ0HYYHCTaLWyVGb71 wAuCJniDC+kHUH+nYhYKdX0yTEpBkUgSKrIH2Z9vImolTGiPLvVHDmHpNz2QrAkeqRSk C5mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794307923; x=1794912723; h=content-type: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:content-type; bh=luY53rQnSHqOmqiVXG3ojpIoE98d8W8aTwUr99JyWqc=; b=iwhRrmK3OpcfdHtoyzUKZTvgP/lkQpkTupyeUIGUM5fj4x7nUJ+pnHmf4FtQ7dcf5q 0DCgyXm68yfU09trQMsgGdDhac9+GbFhR7znWiK6Rxc5qX/MaW97qBAaif3nNviVdYnv +f2BS1fIwAU3pG5eBV8Re+DyTwKFuSYTHz7iYA27ixMcC0HTifqwCljtwZtpg5ZBj5Iz LojQSn+NLBU/V8Y7fNobYo5NucFrgLwvQABef7ZU6Tavn5h4hefZ9l2iZoWyVSmklYib Bw/JLck/lBoNUFpHHFHSZ9TTPSAjVMyqgDU3p+JeOwMXBB6bd0KQs2nNKb+wU4FoSDpX VcbQ== X-Forwarded-Encrypted: i=1; AL+hErFKlZZNzx1jxO8vslSJGfXUU1KYJc/giu0OrHaiw04n3wp7dVCpTzzsH6S1pkdxWYN9TUYCDjn6pzNmp5ghXuc=@vger.kernel.org X-Gm-Message-State: APuU4Z9IwhzJ4Ynp1DENpiC+jvY9A6j/HJz2GMpvEPDeEUxRphLMHG3Z ifye9zx7/ahwOQd6HqYnOelKNaJ6ZuXGLHwFAIf7ZMePI2lY1AWaMzhrNqKaNuhKULMF9SzTIXP OCg== X-Received: from pldt9.prod.google.com ([2002:a17:903:40c9:b0:2e5:a015:564e]) (user=wakel job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f686:b0:2ec:ed58:2062 with SMTP id d9443c01a7336-2edb9278fa6mr19990085ad.35.1794307922487; Tue, 10 Nov 2026 02:52:02 -0800 (PST) Date: Tue, 10 Nov 2026 10:51:58 +0000 In-Reply-To: <20261105030834.3318480-1-wakel@google.com> X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261105030834.3318480-1-wakel@google.com> X-Mailer: git-send-email 2.56.0.506.g506a7eabc5-goog Message-ID: <20261110105158.975652-1-wakel@google.com> Subject: [PATCH v3] selftests: rtc: Support harness test filtering and arguments From: Wake Liu To: Alexandre Belloni , Shuah Khan Cc: Shuah Khan , linux-rtc@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Wake Liu Content-Type: text/plain; charset="UTF-8" rtctest implements its own main() function with a rigid switch (argc) check that only accepts an optional single argument for the RTC device node path. This prevents kselftest_harness standard arguments from working properly: 1. Passing filter options like -t or -T triggers a usage error because argc is greater than 2. 2. Passing -l or -h causes rtctest to treat "-l" or "-h" as the device node path and fail with access() errors before ever reaching the harness argument checker. Parse command line arguments with getopt() to pass all kselftest harness options (such as -t, -T, -v, -V, -f, -F, -r, -d, -h, and -l) through to test_harness_run(), while preserving the ability to specify an optional RTC device node path as a non-option argument. Only reset optind once all options have been parsed, so the harness re-parses them from a clean getopt() state, and bypass device accessibility checks when help or test listing is requested. Signed-off-by: Wake Liu Acked-by: Alexandre Belloni --- v3: - Don't call test_harness_run() from inside the getopt() loop for -h and -l. getopt() keeps its position inside grouped options, so with e.g. "-ld" the harness resumed at 'd', missed -l/-h and ran the whole suite without the device check. Record -h/-l instead and reset optind only after all options have been parsed. Reported by Sashiko AI review. - Kept Alexandre's Acked-by as the change is limited to the -h/-l handling. Alexandre, please let me know if you'd rather re-check. v2: https://lore.kernel.org/all/20261105030834.3318480-1-wakel@google.com/ - Rebased onto v7.4-rc1, no code changes. - Added Alexandre's Acked-by. v1: https://lore.kernel.org/all/20260910034821.2935214-1-wakel@google.com/ Alexandre, if you're still fine with it, could you queue this via the RTC tree along with the other rtctest changes? Shuah, please let me know if you would rather take it via kselftest. tools/testing/selftests/rtc/rtctest.c | 54 ++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/rtc/rtctest.c b/tools/testing/selftests/rtc/rtctest.c index 552191fe1ca0..21c37764f9d3 100644 --- a/tools/testing/selftests/rtc/rtctest.c +++ b/tools/testing/selftests/rtc/rtctest.c @@ -487,18 +487,54 @@ TEST_F_TIMEOUT(rtc, alarm_wkalm_set_minute, 65) { int main(int argc, char **argv) { int ret = -1; + int opt, i; + int non_opt = 0; + bool skip_dev_check = false; + + while ((opt = getopt(argc, argv, "dhlF:f:V:v:t:T:r:")) != -1) { + switch (opt) { + case 'h': + fprintf(stderr, + "Usage: %s [-h|-l|-d] [-t|-T|-v|-V|-f|-F|-r name] [rtcdev]\n\n", + argv[0]); + skip_dev_check = true; + break; + case 'l': + skip_dev_check = true; + break; + case '?': + fprintf(stderr, + "Usage: %s [-h|-l|-d] [-t|-T|-v|-V|-f|-F|-r name] [rtcdev]\n", + argv[0]); + return KSFT_FAIL; + default: + break; + } + } - switch (argc) { - case 2: - rtc_file = argv[1]; - /* FALLTHROUGH */ - case 1: - break; - default: - fprintf(stderr, "usage: %s [rtcdev]\n", argv[0]); - return 1; + for (i = optind; i < argc; i++) { + if (non_opt == 0) { + rtc_file = argv[i]; + non_opt++; + } else { + fprintf(stderr, + "Usage: %s [-h|-l|-d] [-t|-T|-v|-V|-f|-F|-r name] [rtcdev]\n", + argv[0]); + return KSFT_FAIL; + } } + /* + * Rewind getopt() so test_harness_run() can parse the options again. + * Only do this after the loop above has consumed every option, as + * getopt() keeps its position within grouped options (e.g. "-ld"). + */ + optind = 1; + + /* -h and -l are handled by the harness and need no RTC device */ + if (skip_dev_check) + return test_harness_run(argc, argv); + /* Run the test if rtc_file is accessible */ if (access(rtc_file, R_OK) == 0) ret = test_harness_run(argc, argv); base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 -- 2.56.0.542.g3ef89b7020-goog