* [PATCH] TestCommon: older strace does not have --version
@ 2023-11-14 20:16 Konstantin Ryabitsev
2023-11-14 20:22 ` Eric Wong
0 siblings, 1 reply; 2+ messages in thread
From: Konstantin Ryabitsev @ 2023-11-14 20:16 UTC (permalink / raw)
To: meta; +Cc: Konstantin Ryabitsev
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 <konstantin@linuxfoundation.org>
---
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 <konstantin@linuxfoundation.org>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] TestCommon: older strace does not have --version
2023-11-14 20:16 [PATCH] TestCommon: older strace does not have --version Konstantin Ryabitsev
@ 2023-11-14 20:22 ` Eric Wong
0 siblings, 0 replies; 2+ messages in thread
From: Eric Wong @ 2023-11-14 20:22 UTC (permalink / raw)
To: Konstantin Ryabitsev; +Cc: meta
Thanks, pushed as commit 58e6ee9df4f74b1078541c8924cf2918ceec0765
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-11-14 20:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-14 20:16 [PATCH] TestCommon: older strace does not have --version Konstantin Ryabitsev
2023-11-14 20:22 ` Eric Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).