diff options
author | Ross Burton <ross.burton@arm.com> | 2024-03-15 14:37:37 +0000 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2024-03-28 07:08:30 -1000 |
commit | 8a20101d142f0edb32ee1c0f0292a79d2bc90af2 (patch) | |
tree | 0e82cec3e1d90eadbbeb2a892888f266411f26f2 | |
parent | ba6ed3b8311fd5791a06efc59cee75a3f4d5ea54 (diff) | |
download | poky-8a20101d142f0edb32ee1c0f0292a79d2bc90af2.tar.gz |
curl: increase test timeouts
We often see multiple curl tests fail during ptest runs, the actual test
varies but the output is like this:
FAIL: 337: protoc!
There was no content at all in the file log/3/server.input.
Server glitch? Total curl failure? Returned: 28
Error code 28 is CURLE_OPERATION_TIMEDOUT, so this is almost certainly
due to a loaded machine resulting in the tests running slowly.
It is notable that the test runner explicitly passes --max-time=13 to
curl, so experiment and change this to 600 to see if this solves the
problem.
[ YOCTO #15268 ]
(From OE-Core rev: d105cc0dae1fcca285c08f33df7888c68fb0dc2f)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e2e9ec1bf97a7e36a05a247dbc671ecca584205f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-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 | ||