summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/valgrind
diff options
context:
space:
mode:
authorTony Tascioglu <tony.tascioglu@windriver.com>2021-06-15 10:53:12 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-17 13:42:31 +0100
commit7933c2125b21d729efa6e1b663f929dc923458d0 (patch)
treef580252fccc5662dfd8eeffaae5a54ae2f028241 /meta/recipes-devtools/valgrind
parent60fe30204c7db6918f37b6ce6cf2018da9e76fb4 (diff)
downloadpoky-7933c2125b21d729efa6e1b663f929dc923458d0.tar.gz
valgrind: Actually install list of non-deterministic ptests
Install list of non-deterministic threaded ptests to be run using taskset to force them to a single core. This commit works with b318944d7, which updated the testing script to run the non-deterministic tests separately but didn't install the list of tests, so these tests were being run without taskset. The taskset_nondeterministic_tests file is the list of tests that will be run separately with taskset, and ignored during the other tests. This is installed to /usr/lib/valgrind/ptest similar to the 2 existing lists for tests to skip on ARM and all architectures. Removed bar_bad and bar_bad_xml to be included separately as they cause issues on non-kvm QEMU instances. See: b318944dd7 valgrind: Improve non-deterministic ptest reliability for more info. (From OE-Core rev: 3d23985d0d653844863ed513d75d93a36359992f) Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/valgrind')
-rwxr-xr-xmeta/recipes-devtools/valgrind/valgrind/run-ptest4
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/taskset_nondeterministic_tests2
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.17.0.bb2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/run-ptest b/meta/recipes-devtools/valgrind/valgrind/run-ptest
index 11050a8312..caeae84d4f 100755
--- a/meta/recipes-devtools/valgrind/valgrind/run-ptest
+++ b/meta/recipes-devtools/valgrind/valgrind/run-ptest
@@ -34,7 +34,7 @@ fi
34 34
35echo "Run flaky tests using taskset to limit them to a single core." 35echo "Run flaky tests using taskset to limit them to a single core."
36for i in `cat taskset_nondeterministic_tests`; do 36for i in `cat taskset_nondeterministic_tests`; do
37 taskset 0x00000001 perl tests/vg_regtest --valgrind=${VALGRIND_BIN} --valgrind-lib=${VALGRIND_LIBEXECDIR} --yocto-ptest $i 2>&1|tee ${LOG} 37 taskset 0x00000001 perl tests/vg_regtest --valgrind=${VALGRIND_BIN} --valgrind-lib=${VALGRIND_LIBEXECDIR} --yocto-ptest $i 2>&1|tee -a ${LOG}
38 mv $i.vgtest $i.IGNORE 38 mv $i.vgtest $i.IGNORE
39done 39done
40 40
@@ -44,7 +44,7 @@ cd ${VALGRIND_LIB}/ptest && ./tests/vg_regtest \
44 --valgrind-lib=${VALGRIND_LIBEXECDIR} \ 44 --valgrind-lib=${VALGRIND_LIBEXECDIR} \
45 --yocto-ptest \ 45 --yocto-ptest \
46 gdbserver_tests ${TOOLS} ${EXP_TOOLS} \ 46 gdbserver_tests ${TOOLS} ${EXP_TOOLS} \
47 2>&1|tee ${LOG} 47 2>&1|tee -a ${LOG}
48 48
49cd ${VALGRIND_LIB}/ptest && \ 49cd ${VALGRIND_LIB}/ptest && \
50 ./tests/post_regtest_checks $(pwd) \ 50 ./tests/post_regtest_checks $(pwd) \
diff --git a/meta/recipes-devtools/valgrind/valgrind/taskset_nondeterministic_tests b/meta/recipes-devtools/valgrind/valgrind/taskset_nondeterministic_tests
index cf073fa927..e15100ade7 100644
--- a/meta/recipes-devtools/valgrind/valgrind/taskset_nondeterministic_tests
+++ b/meta/recipes-devtools/valgrind/valgrind/taskset_nondeterministic_tests
@@ -1,4 +1,2 @@
1helgrind/tests/hg05_race2 1helgrind/tests/hg05_race2
2helgrind/tests/tc09_bad_unlock 2helgrind/tests/tc09_bad_unlock
3drd/tests/bar_bad
4drd/tests/bar_bad_xml
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.17.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.17.0.bb
index 7fcb086789..60b248681e 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.17.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.17.0.bb
@@ -18,6 +18,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
18 file://run-ptest \ 18 file://run-ptest \
19 file://remove-for-aarch64 \ 19 file://remove-for-aarch64 \
20 file://remove-for-all \ 20 file://remove-for-all \
21 file://taskset_nondeterministic_tests \
21 file://0004-Fix-out-of-tree-builds.patch \ 22 file://0004-Fix-out-of-tree-builds.patch \
22 file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \ 23 file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \
23 file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \ 24 file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \
@@ -187,6 +188,7 @@ do_install_ptest() {
187 cp ${B}/config.h ${D}${PTEST_PATH} 188 cp ${B}/config.h ${D}${PTEST_PATH}
188 install -D ${WORKDIR}/remove-for-aarch64 ${D}${PTEST_PATH} 189 install -D ${WORKDIR}/remove-for-aarch64 ${D}${PTEST_PATH}
189 install -D ${WORKDIR}/remove-for-all ${D}${PTEST_PATH} 190 install -D ${WORKDIR}/remove-for-all ${D}${PTEST_PATH}
191 install -D ${WORKDIR}/taskset_nondeterministic_tests ${D}${PTEST_PATH}
190 192
191 # Add an executable need by none/tests/bigcode 193 # Add an executable need by none/tests/bigcode
192 mkdir ${D}${PTEST_PATH}/perf 194 mkdir ${D}${PTEST_PATH}/perf