diff options
author | Tony Tascioglu <tony.tascioglu@windriver.com> | 2021-06-15 10:53:12 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-26 15:24:08 +0100 |
commit | bc3fd6bee06966ee0fda8f5f8226f0fe468e1ad9 (patch) | |
tree | 30a5bff8df469936c876c6e71102754abb971df3 /meta | |
parent | bc1a94783b1baebedf0f92997aa277b4cbacc363 (diff) | |
download | poky-bc3fd6bee06966ee0fda8f5f8226f0fe468e1ad9.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: f076edb7515ba2ecfc0adbfdf30ae5a9aa96e231)
Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3d23985d0d653844863ed513d75d93a36359992f)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
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 b563eb3567..a19944f285 100755 --- a/meta/recipes-devtools/valgrind/valgrind/run-ptest +++ b/meta/recipes-devtools/valgrind/valgrind/run-ptest | |||
@@ -33,7 +33,7 @@ fi | |||
33 | 33 | ||
34 | echo "Run flaky tests using taskset to limit them to a single core." | 34 | echo "Run flaky tests using taskset to limit them to a single core." |
35 | for i in `cat taskset_nondeterministic_tests`; do | 35 | for i in `cat taskset_nondeterministic_tests`; do |
36 | taskset 0x00000001 perl tests/vg_regtest --valgrind=${VALGRIND_BIN} --valgrind-lib=${VALGRIND_LIBEXECDIR} --yocto-ptest $i 2>&1|tee ${LOG} | 36 | taskset 0x00000001 perl tests/vg_regtest --valgrind=${VALGRIND_BIN} --valgrind-lib=${VALGRIND_LIBEXECDIR} --yocto-ptest $i 2>&1|tee -a ${LOG} |
37 | mv $i.vgtest $i.IGNORE | 37 | mv $i.vgtest $i.IGNORE |
38 | done | 38 | done |
39 | 39 | ||
@@ -43,7 +43,7 @@ cd ${VALGRIND_LIB}/ptest && ./tests/vg_regtest \ | |||
43 | --valgrind-lib=${VALGRIND_LIB} \ | 43 | --valgrind-lib=${VALGRIND_LIB} \ |
44 | --yocto-ptest \ | 44 | --yocto-ptest \ |
45 | gdbserver_tests ${TOOLS} ${EXP_TOOLS} \ | 45 | gdbserver_tests ${TOOLS} ${EXP_TOOLS} \ |
46 | 2>&1|tee ${LOG} | 46 | 2>&1|tee -a ${LOG} |
47 | 47 | ||
48 | cd ${VALGRIND_LIB}/ptest && \ | 48 | cd ${VALGRIND_LIB}/ptest && \ |
49 | ./tests/post_regtest_checks $(pwd) \ | 49 | ./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 @@ | |||
1 | helgrind/tests/hg05_race2 | 1 | helgrind/tests/hg05_race2 |
2 | helgrind/tests/tc09_bad_unlock | 2 | helgrind/tests/tc09_bad_unlock |
3 | drd/tests/bar_bad | ||
4 | drd/tests/bar_bad_xml | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb index 3493745828..b48d96f8a3 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.16.1.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 \ |
@@ -189,6 +190,7 @@ do_install_ptest() { | |||
189 | cp ${B}/config.h ${D}${PTEST_PATH} | 190 | cp ${B}/config.h ${D}${PTEST_PATH} |
190 | install -D ${WORKDIR}/remove-for-aarch64 ${D}${PTEST_PATH} | 191 | install -D ${WORKDIR}/remove-for-aarch64 ${D}${PTEST_PATH} |
191 | install -D ${WORKDIR}/remove-for-all ${D}${PTEST_PATH} | 192 | install -D ${WORKDIR}/remove-for-all ${D}${PTEST_PATH} |
193 | install -D ${WORKDIR}/taskset_nondeterministic_tests ${D}${PTEST_PATH} | ||
192 | 194 | ||
193 | # Add an executable need by none/tests/bigcode | 195 | # Add an executable need by none/tests/bigcode |
194 | mkdir ${D}${PTEST_PATH}/perf | 196 | mkdir ${D}${PTEST_PATH}/perf |