diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-01-27 15:19:07 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-02 16:57:21 +0000 |
commit | 85a0d6102580da2fa90ae06ccff0716fe755a9d0 (patch) | |
tree | dff54caf0549a5ab55edb113dbbab2a930fed457 /meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | |
parent | c404b8895904abdb7b67aeaf854805ab40bc2c45 (diff) | |
download | poky-85a0d6102580da2fa90ae06ccff0716fe755a9d0.tar.gz |
valgrind: fix the remaining ptest failures
Particularly, one test is disabled as it is failing everywhere,
two patches that actually cause failures are dropped and
some binaries are prevented from being stripped where that is
expected.
(From OE-Core rev: 64bc13f3c9c96584494f0984da5253a306e8a140)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/valgrind/valgrind_3.15.0.bb')
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 6a3834cfdc..0f86aa44ca 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | |||
@@ -29,7 +29,6 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ | |||
29 | file://0003-correct-include-directive-path-for-config.h.patch \ | 29 | file://0003-correct-include-directive-path-for-config.h.patch \ |
30 | file://0004-pth_atfork1.c-Define-error-API-for-musl.patch \ | 30 | file://0004-pth_atfork1.c-Define-error-API-for-musl.patch \ |
31 | file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \ | 31 | file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \ |
32 | file://0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch \ | ||
33 | file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ | 32 | file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ |
34 | file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ | 33 | file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ |
35 | file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ | 34 | file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ |
@@ -38,9 +37,9 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ | |||
38 | file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \ | 37 | file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \ |
39 | file://0001-Return-a-valid-exit_code-from-vg_regtest.patch \ | 38 | file://0001-Return-a-valid-exit_code-from-vg_regtest.patch \ |
40 | file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \ | 39 | file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \ |
41 | file://0002-valgrind-adjust-std_list-expected-output.patch \ | ||
42 | file://0001-adjust-path-filter-for-2-memcheck-tests.patch \ | 40 | file://0001-adjust-path-filter-for-2-memcheck-tests.patch \ |
43 | file://s390x_vec_op_t.patch \ | 41 | file://s390x_vec_op_t.patch \ |
42 | file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ | ||
44 | " | 43 | " |
45 | SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" | 44 | SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" |
46 | SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1" | 45 | SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1" |
@@ -205,4 +204,24 @@ do_install_ptest() { | |||
205 | # handle multilib | 204 | # handle multilib |
206 | sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest | 205 | sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest |
207 | sed -i s:@bindir@:${bindir}:g ${D}${PTEST_PATH}/run-ptest | 206 | sed -i s:@bindir@:${bindir}:g ${D}${PTEST_PATH}/run-ptest |
207 | |||
208 | # This test fails on the host as well, using both 3.15 and git master (as of Jan 24 2020) | ||
209 | # https://bugs.kde.org/show_bug.cgi?id=402833 | ||
210 | rm ${D}${PTEST_PATH}/memcheck/tests/overlap.vgtest | ||
211 | |||
212 | # As the binary isn't stripped or debug-splitted, the source file isn't fetched | ||
213 | # via dwarfsrcfiles either, so it needs to be installed manually. | ||
214 | mkdir -p ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/ | ||
215 | install ${S}/none/tests/tls.c ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/ | ||
208 | } | 216 | } |
217 | |||
218 | # avoid stripping some generated binaries otherwise some of the tests will fail | ||
219 | # run-strip-reloc.sh, run-strip-strmerge.sh and so on will fail | ||
220 | INHIBIT_PACKAGE_STRIP_FILES = "\ | ||
221 | ${PKGD}${PTEST_PATH}/none/tests/tls \ | ||
222 | ${PKGD}${PTEST_PATH}/none/tests/tls.so \ | ||
223 | ${PKGD}${PTEST_PATH}/none/tests/tls2.so \ | ||
224 | ${PKGD}${PTEST_PATH}/helgrind/tests/tc09_bad_unlock \ | ||
225 | ${PKGD}${PTEST_PATH}/memcheck/tests/manuel1 \ | ||
226 | ${PKGD}${PTEST_PATH}/drd/tests/pth_detached3 \ | ||
227 | " | ||