Skip to content

Commit

Permalink
Update patches and build methods for integration CI (#1507)
Browse files Browse the repository at this point in the history
The Open Source community was quite busy today with multiple projects
updating main which broke our patches. Most of these are good changes
which lead to better integration though.
* nginx-tests: python/cpython@c85d841
* mariadb: MariaDB/server@14ec153
* CPython
   * 3.12: python/cpython@05c5bec
    * main: python/cpython@c85d841
  • Loading branch information
samuel40791765 authored Mar 21, 2024
1 parent d6d2eb7 commit 1af7018
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 627 deletions.
72 changes: 6 additions & 66 deletions tests/ci/integration/nginx_tests_patch/aws-lc-nginx-tests.patch
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,6 @@ index e9ef846..eaac4de 100644

is(test_reuse(8945), 1, 'cache shared reused');
is(test_reuse(8946), 1, 'cache builtin reused');
diff --git a/mail_ssl_conf_command.t b/mail_ssl_conf_command.t
index 7686eca..cdb7df0 100644
--- a/mail_ssl_conf_command.t
+++ b/mail_ssl_conf_command.t
@@ -30,6 +30,7 @@ my $t = Test::Nginx->new()
->has_daemon('openssl');

plan(skip_all => 'no ssl_conf_command') if $t->has_module('BoringSSL');
+plan(skip_all => 'no ssl_conf_command') if $t->has_module('AWS-LC');

$t->write_file_expand('nginx.conf', <<'EOF');

diff --git a/mail_ssl_session_reuse.t b/mail_ssl_session_reuse.t
index 96330cc..30ed758 100644
--- a/mail_ssl_session_reuse.t
Expand All @@ -48,23 +36,11 @@ index 96330cc..30ed758 100644

is(test_reuse(8995), 1, 'cache shared reused');
is(test_reuse(8996), 1, 'cache builtin reused');
diff --git a/proxy_ssl_conf_command.t b/proxy_ssl_conf_command.t
index c06cbec..0d3aa65 100644
--- a/proxy_ssl_conf_command.t
+++ b/proxy_ssl_conf_command.t
@@ -27,6 +27,7 @@ my $t = Test::Nginx->new()
->has_daemon('openssl');

plan(skip_all => 'no ssl_conf_command') if $t->has_module('BoringSSL');
+plan(skip_all => 'no ssl_conf_command') if $t->has_module('AWS-LC');

$t->write_file_expand('nginx.conf', <<'EOF')->plan(3);

diff --git a/ssl.t b/ssl.t
index 13d3dae..2378602 100644
index 6055e08..bbbe4dd 100644
--- a/ssl.t
+++ b/ssl.t
@@ -215,6 +215,8 @@ local $TODO = 'no TLSv1.3 sessions in LibreSSL'
@@ -218,6 +218,8 @@ local $TODO = 'no TLSv1.3 sessions in LibreSSL'
if $t->has_module('LibreSSL') && test_tls13();
local $TODO = 'no TLSv1.3 sessions ids in BoringSSL'
if $t->has_module('BoringSSL') && test_tls13();
Expand All @@ -73,31 +49,19 @@ index 13d3dae..2378602 100644

like(get('/id', 8085, $ctx), qr/^body \w{64}$/m, 'session id reused');

@@ -226,6 +228,7 @@ like(get('/cipher', 8085), qr/^body [\w-]+$/m, 'cipher');
@@ -229,6 +231,7 @@ like(get('/cipher', 8085), qr/^body [\w-]+$/m, 'cipher');

SKIP: {
skip 'BoringSSL', 1 if $t->has_module('BoringSSL');
+skip 'AWS-LC', 1 if $t->has_module('AWS-LC');

like(get('/ciphers', 8085), qr/^body [:\w-]+$/m, 'ciphers');

diff --git a/ssl_conf_command.t b/ssl_conf_command.t
index d4ae398..ef9836e 100644
--- a/ssl_conf_command.t
+++ b/ssl_conf_command.t
@@ -27,6 +27,7 @@ my $t = Test::Nginx->new()
->has_daemon('openssl');

plan(skip_all => 'no ssl_conf_command') if $t->has_module('BoringSSL');
+plan(skip_all => 'no ssl_conf_command') if $t->has_module('AWS-LC');

$t->write_file_expand('nginx.conf', <<'EOF');

diff --git a/ssl_ocsp.t b/ssl_ocsp.t
index 3bc9af4..8504204 100644
index 8f6b26d..ee9a82d 100644
--- a/ssl_ocsp.t
+++ b/ssl_ocsp.t
@@ -358,6 +358,8 @@ local $TODO = 'no TLSv1.3 sessions, old IO::Socket::SSL'
@@ -363,6 +363,8 @@ local $TODO = 'no TLSv1.3 sessions, old IO::Socket::SSL'
if $IO::Socket::SSL::VERSION < 2.061 && test_tls13();
local $TODO = 'no TLSv1.3 sessions in LibreSSL'
if $t->has_module('LibreSSL') && test_tls13();
Expand All @@ -106,7 +70,7 @@ index 3bc9af4..8504204 100644

like(get('ec-end', ses => $s),
qr/200 OK.*SUCCESS:r/s, 'session reused');
@@ -390,6 +392,8 @@ local $TODO = 'no TLSv1.3 sessions, old IO::Socket::SSL'
@@ -395,6 +397,8 @@ local $TODO = 'no TLSv1.3 sessions, old IO::Socket::SSL'
if $IO::Socket::SSL::VERSION < 2.061 && test_tls13();
local $TODO = 'no TLSv1.3 sessions in LibreSSL'
if $t->has_module('LibreSSL') && test_tls13();
Expand Down Expand Up @@ -141,30 +105,6 @@ index 7ff5fa0..958bfaa 100644

$t->plan(6);

diff --git a/stream_proxy_ssl_conf_command.t b/stream_proxy_ssl_conf_command.t
index d9b3807..a70fd6d 100644
--- a/stream_proxy_ssl_conf_command.t
+++ b/stream_proxy_ssl_conf_command.t
@@ -27,6 +27,7 @@ my $t = Test::Nginx->new()
->has_daemon('openssl');

plan(skip_all => 'no ssl_conf_command') if $t->has_module('BoringSSL');
+plan(skip_all => 'no ssl_conf_command') if $t->has_module('AWS-LC');

$t->write_file_expand('nginx.conf', <<'EOF');

diff --git a/stream_ssl_conf_command.t b/stream_ssl_conf_command.t
index 2b8c8a3..3db9c2b 100644
--- a/stream_ssl_conf_command.t
+++ b/stream_ssl_conf_command.t
@@ -29,6 +29,7 @@ my $t = Test::Nginx->new()
->has_daemon('openssl');

plan(skip_all => 'no ssl_conf_command') if $t->has_module('BoringSSL');
+plan(skip_all => 'no ssl_conf_command') if $t->has_module('AWS-LC');

$t->write_file_expand('nginx.conf', <<'EOF');

diff --git a/stream_ssl_session_reuse.t b/stream_ssl_session_reuse.t
index 53f24d2..39b7d62 100644
--- a/stream_ssl_session_reuse.t
Expand Down
Loading

0 comments on commit 1af7018

Please sign in to comment.