From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS54825 145.40.73.0/24 X-Spam-Status: No, score=-3.3 required=3.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 45FB91F406 for ; Tue, 14 Nov 2023 20:16:54 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=L1wf6kGP; dkim-atps=neutral Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 47C8CCE19FA; Tue, 14 Nov 2023 20:16:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37EE6C433CA; Tue, 14 Nov 2023 20:16:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1699993010; bh=sa8LVgSbe+2b2iw1J38MLA0asCfw+A7dAAsuJ1PJYao=; h=From:Date:Subject:To:Cc:From; b=L1wf6kGPNOJSrImDBa7u2p936bxtDvHBXJQdgrH4xbMIC+HyHrOVANpZxrt1Jly6m Brr6jVFxnyB0hWtQbaWlmxwe0Mf4KB3iiSLAf6YTAsKIT83Bvt34mieQiVExoslKab RhXQRmtPgyWOh6xj40nAowC6TxqEXMflpqLmdI0I= From: Konstantin Ryabitsev Date: Tue, 14 Nov 2023 15:16:37 -0500 Subject: [PATCH] TestCommon: older strace does not have --version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20231114-strace-no-version-v1-1-4d97f031f1fa@linuxfoundation.org> X-B4-Tracking: v=1; b=H4sIAKTVU2UC/x2MQQqAMAzAvjJ6trBOUfAr4mG4qr1M6WQIw787P QaSFEiswglGU0A5S5IjVqDGwLL7uDFKqAzOupaIOkyX+oUxHphZPxsHO7RrsM576qF2p/Iq9/+ c5ud5AbR33XVjAAAA To: meta@public-inbox.org Cc: Konstantin Ryabitsev X-Mailer: b4 0.13-dev-53db1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1184; i=konstantin@linuxfoundation.org; h=from:subject:message-id; bh=sa8LVgSbe+2b2iw1J38MLA0asCfw+A7dAAsuJ1PJYao=; b=owGbwMvMwCW27YjM47CUmTmMp9WSGFKDr25Ut3h+dO7Nm7d8Pnm8LXh388lt+e7y3zu6LRkmH 3upcZZ7XUcpC4MYF4OsmCJL2b7YTUGFDz3k0ntMYeawMoEMYeDiFICJRE9n+O/s8yAo4LpaTLxG wOG1vEtfbknuOHjkkwzv5rJ5aawK6zIYGV4KbttYM3/hzvDriUce8jFcO2LusqrDKWju/SnrFYP XK3EBAA== X-Developer-Key: i=konstantin@linuxfoundation.org; a=openpgp; fpr=DE0E66E32F1FDD0902666B96E63EDCA9329DD07E List-Id: The tests will check for strace >= 4.16, but version 4.24 that I have does not accept --version, only -V. This works for both older and newer strace, so switch to using "strace -V" for the check. Signed-off-by: Konstantin Ryabitsev --- lib/PublicInbox/TestCommon.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm index caf709c2..a5546905 100644 --- a/lib/PublicInbox/TestCommon.pm +++ b/lib/PublicInbox/TestCommon.pm @@ -956,9 +956,9 @@ sub strace_inject (;$) { my $cmd = strace(@_); state $ver = do { require PublicInbox::Spawn; - my $v = PublicInbox::Spawn::run_qx([$cmd, '--version']); + my $v = PublicInbox::Spawn::run_qx([$cmd, '-V']); $v =~ m!version\s+([1-9]+\.[0-9]+)! or - xbail "no strace --version: $v"; + xbail "no strace -V: $v"; eval("v$1"); }; $ver ge v4.16 or skip "$cmd too old for syscall injection (". --- base-commit: 1f3fdeee8919d06b9293d34a2446a61cba730a0c change-id: 20231114-strace-no-version-7073fd02aa16 Best regards, -- Konstantin Ryabitsev