Skip to content

Commit 2bf44a1

Browse files
committed
Tests: enabled grpc ssl tests on LibreSSL.
1 parent 76f93cd commit 2bf44a1

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

grpc_pass.t

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,9 @@ like(http_get('/basic'), qr/200 OK/, 'no scheme');
112112
like(http_get('/grpc'), qr/200 OK/, 'grpc scheme');
113113

114114
SKIP: {
115-
skip 'OpenSSL too old', 1 unless $t->has_feature('openssl:1.0.2');
115+
skip 'OpenSSL too old', 1
116+
if $t->has_module('OpenSSL')
117+
and not $t->has_feature('openssl:1.0.2');
116118

117119
like(http_get('/grpcs'), qr/200 OK/, 'grpcs scheme');
118120

grpc_ssl.t

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@ select STDERR; $| = 1;
2424
select STDOUT; $| = 1;
2525

2626
my $t = Test::Nginx->new()->has(qw/http rewrite http_v2 grpc/)
27-
->has(qw/upstream_keepalive http_ssl openssl:1.0.2/)
28-
->has_daemon('openssl')
29-
->write_file_expand('nginx.conf', <<'EOF')->plan(38);
27+
->has(qw/upstream_keepalive http_ssl/)
28+
->has_daemon('openssl');
29+
30+
plan(skip_all => 'no ALPN support in OpenSSL')
31+
if $t->has_module('OpenSSL') and not $t->has_feature('openssl:1.0.2');
32+
33+
$t->write_file_expand('nginx.conf', <<'EOF')->plan(38);
3034
3135
%%TEST_GLOBALS%%
3236

0 commit comments

Comments
 (0)