summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-adjust-path-filter-for-2-memcheck-tests.patch40
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.15.0.bb5
2 files changed, 44 insertions, 1 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-adjust-path-filter-for-2-memcheck-tests.patch b/meta/recipes-devtools/valgrind/valgrind/0001-adjust-path-filter-for-2-memcheck-tests.patch
new file mode 100644
index 0000000000..4bc4bb086c
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-adjust-path-filter-for-2-memcheck-tests.patch
@@ -0,0 +1,40 @@
1From bf63e35c3036e6040c8cfecabc7160b1f36b0591 Mon Sep 17 00:00:00 2001
2From: Randy MacLeod <Randy.MacLeod@windriver.com>
3Date: Wed, 28 Aug 2019 12:31:15 -0400
4Subject: [PATCH] adjust path filter for 2 memcheck tests
5
6Test executables produced when cross-compiling can contain
7relative paths such as:
8 coregrind/tests/../../../valgrind-3.15.0/coregrind/
9Use the --fullpath-after option to match and therefore
10suppress more of the prefix to enable test to pass.
11
12Upstream-Status: Inappropriate [embedded specific]
13
14Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
15---
16 memcheck/tests/badfree3.vgtest | 2 +-
17 memcheck/tests/varinfo5.vgtest | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/memcheck/tests/badfree3.vgtest b/memcheck/tests/badfree3.vgtest
21index 3dfc5fd8a..57eec21f3 100644
22--- a/memcheck/tests/badfree3.vgtest
23+++ b/memcheck/tests/badfree3.vgtest
24@@ -1,3 +1,3 @@
25 prog: badfree
26-vgopts: -q --fullpath-after=memcheck/ --fullpath-after=coregrind/
27+vgopts: -q --fullpath-after=/valgrind-3.15.0/memcheck/ --fullpath-after=/valgrind-3.15.0/coregrind/
28 stderr_filter_args: badfree.c
29diff --git a/memcheck/tests/varinfo5.vgtest b/memcheck/tests/varinfo5.vgtest
30index 063d00dce..6907bb2f6 100644
31--- a/memcheck/tests/varinfo5.vgtest
32+++ b/memcheck/tests/varinfo5.vgtest
33@@ -1,3 +1,3 @@
34 prog: varinfo5
35-vgopts: --fullpath-after=memcheck/ --fullpath-after=coregrind/ --read-var-info=yes --read-inline-info=yes -q
36+vgopts: --fullpath-after=/valgrind-3.15.0/memcheck/ --fullpath-after=/valgrind-3.15.0/coregrind/ --read-var-info=yes --read-inline-info=yes -q
37 stderr_filter: filter_varinfo3
38--
392.22.0
40
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb
index 7bb6001d90..bf0ca57c93 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb
@@ -38,6 +38,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
38 file://0001-Return-a-valid-exit_code-from-vg_regtest.patch \ 38 file://0001-Return-a-valid-exit_code-from-vg_regtest.patch \
39 file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \ 39 file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \
40 file://0002-valgrind-adjust-std_list-expected-output.patch \ 40 file://0002-valgrind-adjust-std_list-expected-output.patch \
41 file://0001-adjust-path-filter-for-2-memcheck-tests.patch \
41 " 42 "
42SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" 43SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975"
43SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1" 44SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1"
@@ -109,7 +110,7 @@ RDEPENDS_${PN} += "perl"
109# redirect functions like strlen. 110# redirect functions like strlen.
110RRECOMMENDS_${PN} += "${TCLIBC}-dbg" 111RRECOMMENDS_${PN} += "${TCLIBC}-dbg"
111 112
112RDEPENDS_${PN}-ptest += " bash file perl perl-module-file-glob procps sed ${PN}-dbg" 113RDEPENDS_${PN}-ptest += " bash file libgomp perl perl-module-file-glob procps sed ${PN}-dbg"
113RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" 114RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils"
114 115
115# One of the tests contains a bogus interpreter path on purpose. 116# One of the tests contains a bogus interpreter path on purpose.
@@ -158,6 +159,8 @@ do_install_ptest() {
158 cp ${B}/config.h ${D}${PTEST_PATH} 159 cp ${B}/config.h ${D}${PTEST_PATH}
159 mkdir ${D}${PTEST_PATH}/perf 160 mkdir ${D}${PTEST_PATH}/perf
160 cp ${B}/perf/bigcode ${D}${PTEST_PATH}/perf 161 cp ${B}/perf/bigcode ${D}${PTEST_PATH}/perf
162 # needed by memcheck/tests/vcpu_bz2
163 cp ${B}/perf/bz2 ${D}${PTEST_PATH}/perf
161 164
162 # Hide then restore a.c that is used by ann[12].vgtest in call/cachegrind 165 # Hide then restore a.c that is used by ann[12].vgtest in call/cachegrind
163 mv ${D}${PTEST_PATH}/cachegrind/tests/a.c ${D}${PTEST_PATH}/cachegrind/tests/a_c 166 mv ${D}${PTEST_PATH}/cachegrind/tests/a.c ${D}${PTEST_PATH}/cachegrind/tests/a_c