diff options
Diffstat (limited to 'poky/meta/recipes-devtools/valgrind')
3 files changed, 38 insertions, 3 deletions
diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/0001-gdbserver_tests-Disable-nlcontrolc.vgtest-for-x86-64.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0001-gdbserver_tests-Disable-nlcontrolc.vgtest-for-x86-64.patch new file mode 100644 index 000000000..0bd8273cd --- /dev/null +++ b/poky/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/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest b/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest index 7217dfca5..e8a1a668f 100755 --- a/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest +++ b/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest @@ -12,7 +12,7 @@ VALGRIND_BIN=@bindir@/valgrind LOG="${VALGRIND_LIB}/ptest/valgrind_ptest_$(date +%Y%m%d-%H%M%S).log" TOOLS="memcheck cachegrind callgrind helgrind drd massif dhat lackey none" -EXP_TOOLS="exp-bbv exp-dhat exp-sgcheck" +EXP_TOOLS="exp-bbv" GDB_BIN=@bindir@/gdb cd ${VALGRIND_LIB}/ptest && ./gdbserver_tests/make_local_links ${GDB_BIN} diff --git a/poky/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb b/poky/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb index 25fa58249..fb7713fe4 100644 --- a/poky/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb +++ b/poky/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" @@ -174,8 +175,6 @@ do_install_ptest() { none/tests \ tests \ exp-bbv/tests \ - exp-dhat/tests \ - exp-sgcheck/tests \ " # Get the vg test scripts, filters, and expected files for dir in $subdirs ; do |