From: Gyorgy Sarvari Date: Thu, 23 Oct 2025 10:50:58 +0000 (+0200) Subject: openssl: extend check_cwm test timeout X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=561aba8d38d1e15d23bd13736013825bd04aff2c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Gyorgy Sarvari Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- 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 @@ +From c7000672296f4c367341aa3415f26c4d9f5e4749 Mon Sep 17 00:00:00 2001 +From: Gyorgy Sarvari +Date: Thu, 23 Oct 2025 11:24:36 +0200 +Subject: [PATCH] extend check_cwm test timeout + +The default, 3s long test timeout isn't always enough for this +particular test in case there is a high load on the host machine +(assuming it is running in qemu). Extend the default timeout to 6s +for the check_cwm test to avoid timeouts. + +Upstream-Status: Inappropriate [upstream issue: https://github.com/openssl/openssl/issues/28983] +Signed-off-by: Gyorgy Sarvari +--- + test/radix/main.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/test/radix/main.c b/test/radix/main.c +index 4a1e886a71..39f8c61ef9 100644 +--- a/test/radix/main.c ++++ b/test/radix/main.c +@@ -25,6 +25,11 @@ static int test_script(int idx) + int testresult; + TERP_CONFIG cfg = {0}; + ++ // check_cwm test sometimes times out, the default 3000ms is ++ // not enough if the test execution starves for CPU ++ if (!strncmp("check_cwm", script_info->name, strlen("check_cwm"))) ++ cfg.max_execution_time = ossl_ms2time(6000); ++ + if (!TEST_true(bindings_process_init(0, 0))) + return 0; + 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 \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://0001-Configure-do-not-tweak-mips-cflags.patch \ file://0001-Added-handshake-history-reporting-when-test-fails.patch \ + file://0001-extend-check_cwm-test-timeout.patch \ " SRC_URI:append:class-nativesdk = " \