Skip to content

Commit 54e8135

Browse files
authored
tests: improve openssl version check in test cases.
1 parent a1ec138 commit 54e8135

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

t/139-ssl-cert-by.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if ($openssl_version =~ m/BoringSSL/) {
1212
}
1313

1414
if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) {
15-
plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1");
15+
plan(skip_all => "too old OpenSSL, need >= 1.0.2e, was $1");
1616
} else {
1717
plan tests => repeat_each() * (blocks() * 6 + 4);
1818
}

t/140-ssl-c-api.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ my $NginxBinary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
99
my $openssl_version = eval { `$NginxBinary -V 2>&1` };
1010

1111
if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) {
12-
plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1");
12+
plan(skip_all => "too old OpenSSL, need >= 1.0.2e, was $1");
1313
} elsif ($openssl_version =~ m/BoringSSL/) {
1414
$ENV{TEST_NGINX_USE_BORINGSSL} = 1;
1515
plan tests => repeat_each() * (blocks() * 6 - 6);

t/155-tls13.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ my $NginxBinary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
99
my $openssl_version = eval { `$NginxBinary -V 2>&1` };
1010

1111
if ($openssl_version =~ m/built with OpenSSL (0\S*|1\.0\S*|1\.1\.0\S*)/) {
12-
plan(skip_all => "too old OpenSSL, need 1.1.1, was $1");
12+
plan(skip_all => "too old OpenSSL, need >= 1.1.1, was $1");
1313
} else {
1414
plan tests => repeat_each() * (blocks() * 5);
1515
}

t/166-ssl-client-hello.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ my $NginxBinary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
99
my $openssl_version = eval { `$NginxBinary -V 2>&1` };
1010

1111
if ($openssl_version =~ m/built with OpenSSL (0\S*|1\.0\S*|1\.1\.0\S*)/) {
12-
plan(skip_all => "too old OpenSSL, need 1.1.1, was $1");
12+
plan(skip_all => "too old OpenSSL, need >= 1.1.1, was $1");
1313
} elsif ($openssl_version =~ m/running with BoringSSL/) {
1414
plan(skip_all => "does not support BoringSSL");
1515
} elsif ($ENV{TEST_NGINX_USE_HTTP3}) {

t/187-ssl-two-verification.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ my $NginxBinary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
99
my $openssl_version = eval { `$NginxBinary -V 2>&1` };
1010

1111
if ($openssl_version =~ m/built with OpenSSL (0\S*|1\.0\S*|1\.1\.0\S*)/) {
12-
plan(skip_all => "too old OpenSSL, need 1.1.1, was $1");
12+
plan(skip_all => "too old OpenSSL, need >= 1.1.1, was $1");
1313
} elsif ($openssl_version =~ m/running with BoringSSL/) {
1414
plan(skip_all => "does not support BoringSSL");
1515
} else {

0 commit comments

Comments
 (0)