Skip to contentSkip to conversation

valgrind: Make ptest timestamps copasetic

PATCH New Randy MacLeod 1 participant 2 messages May 17, 2019

lore
Share & tools
lore
#1 lore raw

PATCH 2/2 valgrind: add 'file' to ptest depends

In reply to Randy MacLeod

to avoid:
./run_openmp_test: line 12: /usr/bin/file: No such file or directory
SKIP: drd/tests/omp_matinv
when using core-image-minimal to run valgrind ptests.

---
 meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +1 -1
index 2160fc92d1..85f0ff7562 100644
@@ -110,7 +110,7 @@ RDEPENDS_${PN} += "perl"
 # redirect functions like strlen.
 RRECOMMENDS_${PN} += "${TCLIBC}-dbg"
 
-RDEPENDS_${PN}-ptest += " sed perl perl-module-file-glob ${PN}-dbg"
+RDEPENDS_${PN}-ptest += " file perl perl-module-file-glob sed ${PN}-dbg"
 RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils"
 
 # One of the tests contains a bogus interpreter path on purpose.
Signature · 1 line
2.17.0
#0 lore raw

PATCH 1/2 valgrind: Make ptest timestamps copasetic

Avoid ptest failures due to .diffs such as cachegrind/tests/ann1.post.diff:
@ Source file 'a.c' is more recent than input file 'cgout-test'. @ Annotations may not be correct.
by using:
touch a.c -r cgout-test

---
 meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +1 -0
index ae3498f551..2160fc92d1 100644
@@ -168,6 +168,7 @@ do_install_ptest() {
         -o -name "*.h" \) \
         -exec rm {} \;
     mv ${D}${PTEST_PATH}/cachegrind/tests/a_c ${D}${PTEST_PATH}/cachegrind/tests/a.c
+    touch ${D}${PTEST_PATH}/cachegrind/tests/a.c -r ${D}${PTEST_PATH}/cachegrind/tests/cgout-test
 
     # find *_annotate in ${bindir} for yocto build
     sed -i s:\.\./\.\./cachegrind/cg_annotate:${bindir}/cg_annotate: ${D}${PTEST_PATH}/cachegrind/tests/ann1.vgtest
Signature · 1 line
2.17.0