diff options
| author |   Yi Fan Yu <yifan.yu@windriver.com> | 2021-02-18 11:29:13 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-18 23:38:20 +0000 |
| commit | bb991a24952ebf02cf0092c194d2b3a54a8b2e5b (patch) | |
| tree | 6e4a6c94c9473ca6b6d45df41dee2a0eaf9fa020 | |
| parent | 9ae740939f8315c64fe7571f912404127a29dc89 (diff) | |
| download | openembedded-core-contrib-bb991a24952ebf02cf0092c194d2b3a54a8b2e5b.tar.gz | |
valgrind: Disable ptest nlcontrolc for x86-64
Test hangs after glibc 2.33 uprev.
Using gdb `p t[0]` to modify the timeout
argument no longer affects how long `select` wait.
https://bugs.kde.org/show_bug.cgi?id=432870
[YOCTO #14223]
Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/0001-gdbserver_tests-Disable-nlcontrolc.vgtest-for-x86-64.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-devtools/valgrind/valgrind_3.16.1.bb | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-gdbserver_tests-Disable-nlcontrolc.vgtest-for-x86-64.patch b/meta/recipes-devtools/valgrind/valgrind/0001-gdbserver_tests-Disable-nlcontrolc.vgtest-for-x86-64.patch new file mode 100644 index 0000000000..0bd8273cd8 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-gdbserver_tests-Disable-nlcontrolc.vgtest-for-x86-64.patch @@ -0,0 +1,36 @@ +From d8c19e0bb9ca2fd48f223e1fdeffcafeb0aa1745 Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <yifan.yu@windriver.com> +Date: Wed, 17 Feb 2021 14:53:44 -0500 +Subject: [PATCH] gdbserver_tests: Disable nlcontrolc.vgtest for x86-64 + +Test hangs after glibc 2.33 uprev + +Using gdb to modify the timeout argument no longer +affects how long `select` wait. + +https://bugs.kde.org/show_bug.cgi?id=432870 +Upstream-Status: Pending +Waiting for upstream to take action. + +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> +--- + gdbserver_tests/nlcontrolc.vgtest | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gdbserver_tests/nlcontrolc.vgtest b/gdbserver_tests/nlcontrolc.vgtest +index bb5308403..96d2b52bb 100644 +--- a/gdbserver_tests/nlcontrolc.vgtest ++++ b/gdbserver_tests/nlcontrolc.vgtest +@@ -13,7 +13,8 @@ args: 1000000000 1000000000 1000000000 BSBSBSBS 1 + vgopts: --tool=none --vgdb=yes --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-nlcontrolc + stderr_filter: filter_stderr + # Bug 338633 nlcontrol hangs on arm64 currently. +-prereq: test -e gdb -a -f vgdb.invoker && ! ../tests/arch_test arm64 && ! ../tests/os_test solaris ++# Bug 432870 nlcontrolc hangs on x86-64 starting with glibc 2.33 ++prereq: test -e gdb -a -f vgdb.invoker && ! ../tests/arch_test arm64 && ! ../tests/os_test solaris && ! ../tests/arch_test amd64 + progB: gdb + argsB: --quiet -l 60 --nx ./sleepers + stdinB: nlcontrolc.stdinB.gdb +-- +2.29.2 + diff --git a/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb index 25fa58249c..fc070dec78 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb @@ -44,6 +44,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-drd-Port-to-Fedora-33.patch \ file://0001-drd-musl-fix.patch \ file://0001-helgrind-Intercept-libc-functions.patch \ + file://0001-gdbserver_tests-Disable-nlcontrolc.vgtest-for-x86-64.patch \ " SRC_URI[md5sum] = "d1b153f1ab17cf1f311705e7a83ef589" SRC_URI[sha256sum] = "c91f3a2f7b02db0f3bc99479861656154d241d2fdb265614ba918cc6720a33ca" |