From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mail.openembedded.org (Postfix) with ESMTP id 064FE7FD67 for ; Mon, 27 Jan 2020 14:19:20 +0000 (UTC) Received: by mail-wr1-f51.google.com with SMTP id c9so11501772wrw.8 for ; Mon, 27 Jan 2020 06:19:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=agBJfKAbP7XgZwN808CCR0i0QoJtlDH1p/LgcHs/9Rw=; b=I5m6TIpyJ7W428vKXRxJbzv4SFUoQKTj9jVGxh/qsKj5XUD1SkfLApuQiQBJToB8Dd ZjTqg9ib37THhU4k79gUSe/8AqDk3FR6cGQ+E6LnUFrKIpg5sp/5qGHwO3LkhD18GW8v VcAeRNTfIvwljDM+FOCAKNI3IHcOW+yIMN45aIuD/Ibht8lMt3veW6Tk8kCvbih7KkzV WfVkWlluKFkr5qKfIruZ18xoeES5QPfU0dn1Rhmlvz1TylV/X6MAipOd0UnaoVFdc09i jcLkzcGkjYTUrSZfcOAHSHEhveEbnzvDV71uJg7EHrJJdd5AZ1SoxTHchJuKQp5TIZ05 AtnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=agBJfKAbP7XgZwN808CCR0i0QoJtlDH1p/LgcHs/9Rw=; b=J4DHgLRjJ6SM/+z0S86Yx1Hl9ywpN/P59skl2TSxgfDdM+SCyBbPh3Rx99q1w8/cUz 05c5FyJygbiSUH0TfjqhX+uUr0xj4scQY6wdoDQuHo+hhQytUamP8bXnlUiL7dsY5uIO IePUk/gpOwi9hX0x9O21uBTljJBkPU8Xv3NubQ6giTUq5RlEzES1qPqLhqb8jc153tfu u9JsV3BpTZOw/le+9TobRN5eM8LUJqNgg4fkSO38boMsEq2apEcngMGL9BLfvYdcDhX+ 6k17FOr0dGavNVOhl69WqVL2eGy69fcr8cA5/i8mff6pxUCnNLsNPZDMc/GIfbDJTAG5 Zccw== X-Gm-Message-State: APjAAAX1mT58KmmLmcsV0f08TN7Kdd+iJeMg9827p8s/nWPsox4o3yMn SXcXtzCy2ZsrEzToOMEwUgkSoeRs X-Google-Smtp-Source: APXvYqyrPhC2Z/mmxRY/JElO1BigylmsZbeRWHuFB/XYCn8EuYs6jKGMkdISVxmdGcg3ODrdNCcacQ== X-Received: by 2002:adf:dcc2:: with SMTP id x2mr21789133wrm.24.1580134761388; Mon, 27 Jan 2020 06:19:21 -0800 (PST) Received: from alexander-box.rd.corpintra.net ([141.113.66.202]) by smtp.gmail.com with ESMTPSA id n1sm20533930wrw.52.2020.01.27.06.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2020 06:19:20 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Mon, 27 Jan 2020 15:19:07 +0100 Message-Id: <20200127141908.84922-8-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200127141908.84922-1-alex.kanavin@gmail.com> References: <20200127141908.84922-1-alex.kanavin@gmail.com> Subject: [PATCH 8/9] valgrind: fix the remaining ptest failures X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jan 2020 14:19:21 -0000 Particularly, one test is disabled as it is failing everywhere, two patches that actually cause failures are dropped and some binaries are prevented from being stripped where that is expected. Signed-off-by: Alexander Kanavin --- ...eak_cmsg.stderr.exp-adjust-tmp-paths.patch | 34 +++++++++++++++++++ ...rind-adjust-std_list-expected-output.patch | 32 ----------------- ...Dereference-pthread_t-before-adding-.patch | 32 ----------------- .../valgrind/valgrind_3.15.0.bb | 23 +++++++++++-- 4 files changed, 55 insertions(+), 66 deletions(-) create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch new file mode 100644 index 00000000000..d641998d721 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch @@ -0,0 +1,34 @@ +From f405297d3382cd98391d02f397e2387da1f42879 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 24 Jan 2020 17:55:39 +0100 +Subject: [PATCH] none/tests/fdleak_cmsg.stderr.exp: adjust /tmp paths + +In oe-core, /tmp is linked to /var/volatile/tmp and +valgrind output changes accordingly + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + none/tests/fdleak_cmsg.stderr.exp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/none/tests/fdleak_cmsg.stderr.exp b/none/tests/fdleak_cmsg.stderr.exp +index 6e5a797b9..0ede1ab18 100644 +--- a/none/tests/fdleak_cmsg.stderr.exp ++++ b/none/tests/fdleak_cmsg.stderr.exp +@@ -25,10 +25,10 @@ Open file descriptor ...: /dev/null + + + FILE DESCRIPTORS: 6 open at exit. +-Open file descriptor ...: /tmp/data2 ++Open file descriptor ...: ... + ... + +-Open file descriptor ...: /tmp/data1 ++Open file descriptor ...: ... + ... + + Open AF_UNIX socket ...: +-- +2.17.1 + diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch b/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch deleted file mode 100644 index a82972ec1b6..00000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0002-valgrind-adjust-std_list-expected-output.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6e1e9265b03cf51d09c028d657fe826d7156a783 Mon Sep 17 00:00:00 2001 -From: Randy MacLeod -Date: Mon, 13 May 2019 17:26:26 -0400 -Subject: [PATCH 2/2] valgrind: adjust std_list expected output - -The run-ptest script uses a custom --yocto-ptest option -to change the summary statistics that valgrind issues -to a format that matches what ptest-runner expects. - -Only this std_list test which checks that strcpy() works -properly on Ubuntu-12.04 and later is affected by this change. -It's normal output when called with --yocto-ptest is a blank -line so adjust the expected output. - -Upstream-Status: Inappropriate [Yocto specific] - -Signed-off-by: Randy MacLeod ---- - drd/tests/std_list.stderr.exp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drd/tests/std_list.stderr.exp b/drd/tests/std_list.stderr.exp -index d18786f80..8b1378917 100644 ---- a/drd/tests/std_list.stderr.exp -+++ b/drd/tests/std_list.stderr.exp -@@ -1,3 +1 @@ - -- --ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) --- -2.17.0 - diff --git a/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch b/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch deleted file mode 100644 index 05886c743dc..00000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a6547fc17c120dbd95b852f50b0c4bdee4fedb9a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 10 Jun 2017 01:20:32 -0700 -Subject: [PATCH 6/6] pth_detached3.c: Dereference pthread_t before adding - offset to it - -Fixes -error: invalid use of undefined type 'struct __pthread' - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - drd/tests/pth_detached3.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c -index c02eef1..35d43a6 100644 ---- a/drd/tests/pth_detached3.c -+++ b/drd/tests/pth_detached3.c -@@ -21,7 +21,7 @@ int main(int argc, char** argv) - pthread_detach(thread); - - /* Invoke pthread_detach() with an invalid thread ID. */ -- pthread_detach(thread + 8); -+ pthread_detach((pthread_t*)(&thread + 8)); - - fprintf(stderr, "Finished.\n"); - --- -2.13.1 - diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 6a3834cfdc6..0f86aa44ca6 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb @@ -29,7 +29,6 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0003-correct-include-directive-path-for-config.h.patch \ file://0004-pth_atfork1.c-Define-error-API-for-musl.patch \ file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \ - file://0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch \ file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ @@ -38,9 +37,9 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \ file://0001-Return-a-valid-exit_code-from-vg_regtest.patch \ file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \ - file://0002-valgrind-adjust-std_list-expected-output.patch \ file://0001-adjust-path-filter-for-2-memcheck-tests.patch \ file://s390x_vec_op_t.patch \ + file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ " SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1" @@ -205,4 +204,24 @@ do_install_ptest() { # handle multilib sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest sed -i s:@bindir@:${bindir}:g ${D}${PTEST_PATH}/run-ptest + + # This test fails on the host as well, using both 3.15 and git master (as of Jan 24 2020) + # https://bugs.kde.org/show_bug.cgi?id=402833 + rm ${D}${PTEST_PATH}/memcheck/tests/overlap.vgtest + + # As the binary isn't stripped or debug-splitted, the source file isn't fetched + # via dwarfsrcfiles either, so it needs to be installed manually. + mkdir -p ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/ + install ${S}/none/tests/tls.c ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/ } + +# avoid stripping some generated binaries otherwise some of the tests will fail +# run-strip-reloc.sh, run-strip-strmerge.sh and so on will fail +INHIBIT_PACKAGE_STRIP_FILES = "\ + ${PKGD}${PTEST_PATH}/none/tests/tls \ + ${PKGD}${PTEST_PATH}/none/tests/tls.so \ + ${PKGD}${PTEST_PATH}/none/tests/tls2.so \ + ${PKGD}${PTEST_PATH}/helgrind/tests/tc09_bad_unlock \ + ${PKGD}${PTEST_PATH}/memcheck/tests/manuel1 \ + ${PKGD}${PTEST_PATH}/drd/tests/pth_detached3 \ +" -- 2.17.1