From c4c6bb89cfd083a294a5f760f9b8542b1d5e6715 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 14 Dec 2020 10:10:39 +0100 Subject: valgrind: exclude bar_bad/bar_bad_xml from ptests The tests' output is non-deterministic and sometimes doesn't match the sample output. This has been reported at https://bugs.kde.org/show_bug.cgi?id=430321 (see also an earlier related bug https://bugs.kde.org/show_bug.cgi?id=358213) Until upstream figures out how to fix this, let's not run the tests. (From OE-Core rev: 7f7d2fa18267090891754d976cbc3e628324d3dd) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 | 2 -- meta/recipes-devtools/valgrind/valgrind/remove-for-all | 2 ++ meta/recipes-devtools/valgrind/valgrind/run-ptest | 10 ++++++++++ meta/recipes-devtools/valgrind/valgrind_3.16.1.bb | 2 ++ 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/valgrind/valgrind/remove-for-all diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 index a3a0c6e50f..93bfd45a4e 100644 --- a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 +++ b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 @@ -31,8 +31,6 @@ drd/tests/annotate_static drd/tests/annotate_trace_memory drd/tests/annotate_trace_memory_xml drd/tests/atomic_var -drd/tests/bar_bad -drd/tests/bar_bad_xml drd/tests/bar_trivial drd/tests/bug-235681 drd/tests/bug322621 diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-for-all b/meta/recipes-devtools/valgrind/valgrind/remove-for-all new file mode 100644 index 0000000000..d6a85c4735 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/remove-for-all @@ -0,0 +1,2 @@ +drd/tests/bar_bad +drd/tests/bar_bad_xml diff --git a/meta/recipes-devtools/valgrind/valgrind/run-ptest b/meta/recipes-devtools/valgrind/valgrind/run-ptest index 97b0a85dbf..7217dfca5d 100755 --- a/meta/recipes-devtools/valgrind/valgrind/run-ptest +++ b/meta/recipes-devtools/valgrind/valgrind/run-ptest @@ -17,6 +17,12 @@ EXP_TOOLS="exp-bbv exp-dhat exp-sgcheck" GDB_BIN=@bindir@/gdb cd ${VALGRIND_LIB}/ptest && ./gdbserver_tests/make_local_links ${GDB_BIN} +echo "Hide valgrind tests that are non-deterministic" +echo "Reported at https://bugs.kde.org/show_bug.cgi?id=430321" +for i in `cat remove-for-all`; do + mv $i.vgtest $i.IGNORE; +done + arch=`arch` if [ "$arch" = "aarch64" ]; then echo "Aarch64: Hide valgrind tests that result in defunct process and then out of memory" @@ -44,6 +50,10 @@ if [ "$arch" = "aarch64" ]; then done fi +echo "Restore valgrind tests that are non-deterministc" +for i in `cat remove-for-all`; do + mv $i.IGNORE $i.vgtest; +done passed=`grep PASS: ${LOG}|wc -l` failed=`grep FAIL: ${LOG}|wc -l` diff --git a/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb index 5db181ac14..25fa58249c 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb @@ -16,6 +16,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ file://run-ptest \ file://remove-for-aarch64 \ + file://remove-for-all \ file://0004-Fix-out-of-tree-builds.patch \ file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \ file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \ @@ -186,6 +187,7 @@ do_install_ptest() { # The scripts reference config.h so add it to the top ptest dir. cp ${B}/config.h ${D}${PTEST_PATH} install -D ${WORKDIR}/remove-for-aarch64 ${D}${PTEST_PATH} + install -D ${WORKDIR}/remove-for-all ${D}${PTEST_PATH} # Add an executable need by none/tests/bigcode mkdir ${D}${PTEST_PATH}/perf -- cgit v1.2.3-54-g00ecf