diff options
| -rw-r--r-- | meta/recipes-support/curl/curl/no-test-timeout.patch | 18 | ||||
| -rw-r--r-- | meta/recipes-support/curl/curl_8.4.0.bb | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/meta/recipes-support/curl/curl/no-test-timeout.patch b/meta/recipes-support/curl/curl/no-test-timeout.patch new file mode 100644 index 0000000000..b4cfe716db --- /dev/null +++ b/meta/recipes-support/curl/curl/no-test-timeout.patch | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | Set the max-time timeout to 600 so the timeout is 10 minutes instead of 13 seconds. | ||
| 2 | |||
| 3 | Upstream-Status: Inappropriate | ||
| 4 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
| 5 | |||
| 6 | diff --git a/tests/servers.pm b/tests/servers.pm | ||
| 7 | index d4472d509..aeab62c47 100644 | ||
| 8 | --- a/tests/servers.pm | ||
| 9 | +++ b/tests/servers.pm | ||
| 10 | @@ -120,7 +120,7 @@ my $sshdverstr; # for socks server, ssh daemon version string | ||
| 11 | my $sshderror; # for socks server, ssh daemon version error | ||
| 12 | my %doesntrun; # servers that don't work, identified by pidfile | ||
| 13 | my %PORT = (nolisten => 47); # port we use for a local non-listening service | ||
| 14 | -my $server_response_maxtime=13; | ||
| 15 | +my $server_response_maxtime=600; | ||
| 16 | my $httptlssrv = find_httptlssrv(); | ||
| 17 | my %run; # running server | ||
| 18 | my %runcert; # cert file currently in use by an ssl running server | ||
diff --git a/meta/recipes-support/curl/curl_8.4.0.bb b/meta/recipes-support/curl/curl_8.4.0.bb index bb46efb1e7..0b89542fde 100644 --- a/meta/recipes-support/curl/curl_8.4.0.bb +++ b/meta/recipes-support/curl/curl_8.4.0.bb | |||
| @@ -15,6 +15,7 @@ SRC_URI = " \ | |||
| 15 | file://disable-tests \ | 15 | file://disable-tests \ |
| 16 | file://CVE-2023-46218.patch \ | 16 | file://CVE-2023-46218.patch \ |
| 17 | file://CVE-2023-46219.patch \ | 17 | file://CVE-2023-46219.patch \ |
| 18 | file://no-test-timeout.patch \ | ||
| 18 | " | 19 | " |
| 19 | SRC_URI[sha256sum] = "16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d" | 20 | SRC_URI[sha256sum] = "16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d" |
| 20 | 21 | ||
