summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy MacLeod <Randy.MacLeod@windriver.com>2019-05-13 23:57:16 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-15 17:53:29 +0100
commit3fc20fcef4731438214b890df9b3b38eccd69c7e (patch)
tree765eb076f8e736609190bc52dd652e706d868067
parent5ee06716de105456911419fb33031783c3cf8643 (diff)
downloadpoky-3fc20fcef4731438214b890df9b3b38eccd69c7e.tar.gz
valgrind: fix call/cachegrind ptests
Use the *_annotate executables from ${bindir} Actually install cachegrind/tests/a.c since it is used by the call/cachegrind/tests/ann[12].vgtest files. With this change and the previous commits, the ptest results on qemux86-64 when invoked with: runqemu qemux86 kvm nographic slirp qemuparams="-m 2048" are: === Test Summary === TOTAL: 159 PASSED: 149 FAILED: 1 SKIPPED: 9 Only drd/tests/pth_detached3 remains to be fixed. (From OE-Core rev: 7fc21775e62fddd6620d49a6cf00ca914ba6b4ba) Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.15.0.bb10
1 files changed, 10 insertions, 0 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb
index 4ab2952fde..ae3498f551 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb
@@ -157,6 +157,8 @@ do_install_ptest() {
157 cd $saved_dir 157 cd $saved_dir
158 done 158 done
159 159
160 # Hide then restore a.c that is used by ann[12].vgtest in call/cachegrind
161 mv ${D}${PTEST_PATH}/cachegrind/tests/a.c ${D}${PTEST_PATH}/cachegrind/tests/a_c
160 # clean out build artifacts before building the rpm 162 # clean out build artifacts before building the rpm
161 find ${D}${PTEST_PATH} \ 163 find ${D}${PTEST_PATH} \
162 \( -name "Makefile*" \ 164 \( -name "Makefile*" \
@@ -165,6 +167,14 @@ do_install_ptest() {
165 -o -name "*.S" \ 167 -o -name "*.S" \
166 -o -name "*.h" \) \ 168 -o -name "*.h" \) \
167 -exec rm {} \; 169 -exec rm {} \;
170 mv ${D}${PTEST_PATH}/cachegrind/tests/a_c ${D}${PTEST_PATH}/cachegrind/tests/a.c
171
172 # find *_annotate in ${bindir} for yocto build
173 sed -i s:\.\./\.\./cachegrind/cg_annotate:${bindir}/cg_annotate: ${D}${PTEST_PATH}/cachegrind/tests/ann1.vgtest
174 sed -i s:\.\./\.\./cachegrind/cg_annotate:${bindir}/cg_annotate: ${D}${PTEST_PATH}/cachegrind/tests/ann2.vgtest
175
176 sed -i s:\.\./\.\./callgrind/callgrind_annotate:${bindir}/callgrind_annotate: ${D}${PTEST_PATH}/callgrind/tests/ann1.vgtest
177 sed -i s:\.\./\.\./callgrind/callgrind_annotate:${bindir}/callgrind_annotate: ${D}${PTEST_PATH}/callgrind/tests/ann2.vgtest
168 178
169 # needed by massif tests 179 # needed by massif tests
170 cp ${B}/massif/ms_print ${D}${PTEST_PATH}/massif/ms_print 180 cp ${B}/massif/ms_print ${D}${PTEST_PATH}/massif/ms_print