From 6ff2e8cdd410f70057cfa6259ad395c1119aeb32 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Sat, 8 Apr 2023 23:32:11 +0200 Subject: [PATCH] Simplify version check for SKIP clause Checking for the required versions of IO::Pty as well as IPC::Run can be achieved with a single eval call, and by using the VERSION function the comparison is guaranteed to follow the same rules as calling 'use' on the module with a version. Reported-by: Andrew Dunstan Discussion: https://postgr.es/m/6d880ea2-f8ca-f458-4dcd-a7a3e6d6cd7c@dunslane.net --- src/test/authentication/t/001_password.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/authentication/t/001_password.pl b/src/test/authentication/t/001_password.pl index 10ebe014d69..d7362a4d3ed 100644 --- a/src/test/authentication/t/001_password.pl +++ b/src/test/authentication/t/001_password.pl @@ -107,7 +107,7 @@ is($res, 'SCRAM-SHA-256$1024:', 'scram_iterations in server side ROLE'); SKIP: { skip "IO::Pty and IPC::Run >= 0.98 required", 1 unless - (eval { require IO::Pty; } && eval { $IPC::Run::VERSION >= '0.98' }); + eval { require IO::Pty; IPC::Run->VERSION('0.98'); }; # Alter the password on the created role using \password in psql to ensure # that clientside password changes use the scram_iterations value when -- 2.39.5