summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYi Fan Yu <yifan.yu@windriver.com>2021-02-25 21:14:37 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-10 00:24:27 +0000
commitbab310bf0f13891f22fab5a48c8a02e9d41a0b01 (patch)
treed8b4c4574c5fd50b73e4089be578f0b035f8ec61 /meta
parent631940f199f2d3d81fa527d1dfbaee0808c7d696 (diff)
downloadpoky-bab310bf0f13891f22fab5a48c8a02e9d41a0b01.tar.gz
valgrind: Increase timeout duration 30 -> 90 s
Attempt to fix intermittent failure of `drd/tests/std_list` Locally tested to take around 45 s on qemuarm64 [YOCTO #14228] (From OE-Core rev: cea4b96e8ad2db2db7d8e9cfa825ed82be545775) Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit aac00b1c8042e41cd6bb1aea8e3033a1c6dd2b05) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch b/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch
index 7985308e41..0c399ef52c 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch
@@ -19,6 +19,11 @@ Upstream-Status: Pending
19Signed-off-by: Dave Lerner <dave.lerner@windriver.com> 19Signed-off-by: Dave Lerner <dave.lerner@windriver.com>
20Signed-off-by: Tudor Florea <tudor.florea@enea.com> 20Signed-off-by: Tudor Florea <tudor.florea@enea.com>
21Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 21Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
22
23Increase time limit to 90 s.
24(double of the expected time of drd/tests/std_list on qemuarm64)
25
26Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
22--- 27---
23 tests/vg_regtest.in | 75 +++++++++++++++++++++++++++++++++++++++-------------- 28 tests/vg_regtest.in | 75 +++++++++++++++++++++++++++++++++++++++--------------
24 1 file changed, 55 insertions(+), 20 deletions(-) 29 1 file changed, 55 insertions(+), 20 deletions(-)
@@ -66,7 +71,7 @@ index a441f42..cb05b52 100755
66 # Since most of the program time is spent in system() calls, need this to 71 # Since most of the program time is spent in system() calls, need this to
67 # propagate a Ctrl-C enabling us to quit. 72 # propagate a Ctrl-C enabling us to quit.
68-sub mysystem($) 73-sub mysystem($)
69+# Enforce 30 seconds limit for the test. 74+# Enforce 90 seconds limit for the test.
70+# This resume execution of the remaining tests if valgrind hangs. 75+# This resume execution of the remaining tests if valgrind hangs.
71+sub mysystem($) 76+sub mysystem($)
72 { 77 {
@@ -76,7 +81,7 @@ index a441f42..cb05b52 100755
76+ my $exit_code=0; 81+ my $exit_code=0;
77+ eval { 82+ eval {
78+ local $SIG{'ALRM'} = sub { die "timed out\n" }; 83+ local $SIG{'ALRM'} = sub { die "timed out\n" };
79+ alarm(30); 84+ alarm(90);
80+ $exit_code = system($_[0]); 85+ $exit_code = system($_[0]);
81+ alarm (0); 86+ alarm (0);
82+ ($exit_code == 2) and die "SIGINT\n"; # 2 is SIGINT 87+ ($exit_code == 2) and die "SIGINT\n"; # 2 is SIGINT