diff options
| author | Gyorgy Sarvari <skandigraun@gmail.com> | 2025-10-23 12:50:58 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-11-06 15:09:32 +0000 |
| commit | 9bede3e6bc8bf7b5ef39614f7a7f6e674bb31b34 (patch) | |
| tree | 230f389607856e2f18308d2e9d7664c932cf1419 | |
| parent | 554df58f23c843aceca15035ebf1e3045b9d0342 (diff) | |
| download | poky-9bede3e6bc8bf7b5ef39614f7a7f6e674bb31b34.tar.gz | |
openssl: extend check_cwm test timeout
Fixes [YOCTO 14649]
The default 3s test execution timeout isn't always enough for the check_cwm test
on the autobuilder in case there is a high load on the host machine,
and due to this this case fails sometimes.
This patch doubles the timeout for this testcase to 6 seconds to allow enough
time for execution even if there is high CPU usage by other processes.
(From OE-Core rev: 561aba8d38d1e15d23bd13736013825bd04aff2c)
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl/0001-extend-check_cwm-test-timeout.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl_3.5.4.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-extend-check_cwm-test-timeout.patch b/meta/recipes-connectivity/openssl/openssl/0001-extend-check_cwm-test-timeout.patch new file mode 100644 index 0000000000..d02d42f1b5 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-extend-check_cwm-test-timeout.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | From c7000672296f4c367341aa3415f26c4d9f5e4749 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Thu, 23 Oct 2025 11:24:36 +0200 | ||
| 4 | Subject: [PATCH] extend check_cwm test timeout | ||
| 5 | |||
| 6 | The default, 3s long test timeout isn't always enough for this | ||
| 7 | particular test in case there is a high load on the host machine | ||
| 8 | (assuming it is running in qemu). Extend the default timeout to 6s | ||
| 9 | for the check_cwm test to avoid timeouts. | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate [upstream issue: https://github.com/openssl/openssl/issues/28983] | ||
| 12 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 13 | --- | ||
| 14 | test/radix/main.c | 5 +++++ | ||
| 15 | 1 file changed, 5 insertions(+) | ||
| 16 | |||
| 17 | diff --git a/test/radix/main.c b/test/radix/main.c | ||
| 18 | index 4a1e886a71..39f8c61ef9 100644 | ||
| 19 | --- a/test/radix/main.c | ||
| 20 | +++ b/test/radix/main.c | ||
| 21 | @@ -25,6 +25,11 @@ static int test_script(int idx) | ||
| 22 | int testresult; | ||
| 23 | TERP_CONFIG cfg = {0}; | ||
| 24 | |||
| 25 | + // check_cwm test sometimes times out, the default 3000ms is | ||
| 26 | + // not enough if the test execution starves for CPU | ||
| 27 | + if (!strncmp("check_cwm", script_info->name, strlen("check_cwm"))) | ||
| 28 | + cfg.max_execution_time = ossl_ms2time(6000); | ||
| 29 | + | ||
| 30 | if (!TEST_true(bindings_process_init(0, 0))) | ||
| 31 | return 0; | ||
| 32 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl_3.5.4.bb b/meta/recipes-connectivity/openssl/openssl_3.5.4.bb index c222b1533b..e760baf3a0 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.5.4.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.5.4.bb | |||
| @@ -12,6 +12,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
| 12 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ | 12 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ |
| 13 | file://0001-Configure-do-not-tweak-mips-cflags.patch \ | 13 | file://0001-Configure-do-not-tweak-mips-cflags.patch \ |
| 14 | file://0001-Added-handshake-history-reporting-when-test-fails.patch \ | 14 | file://0001-Added-handshake-history-reporting-when-test-fails.patch \ |
| 15 | file://0001-extend-check_cwm-test-timeout.patch \ | ||
| 15 | " | 16 | " |
| 16 | 17 | ||
| 17 | SRC_URI:append:class-nativesdk = " \ | 18 | SRC_URI:append:class-nativesdk = " \ |
