diff mbox series

valgrind: Drop patch regressing fdleak_cmsg test

Message ID 20241003230144.900743-1-raj.khem@gmail.com
State New
Headers show
Series valgrind: Drop patch regressing fdleak_cmsg test | expand

Commit Message

Khem Raj Oct. 3, 2024, 11:01 p.m. UTC 
This patch is regressing on some distros where systemd
is used and /var/tmp is same as /var/volatime/tmp

Removing this tweak also passes on poky. So I wonder
if we really need this patch anymore

Fixes

Comments

Richard Purdie Oct. 4, 2024, 6:41 a.m. UTC | #1 
On Thu, 2024-10-03 at 16:01 -0700, Khem Raj via lists.openembedded.org
wrote:
> This patch is regressing on some distros where systemd
> is used and /var/tmp is same as /var/volatime/tmp
> 
> Removing this tweak also passes on poky. So I wonder
> if we really need this patch anymore

Removing it does not work on poky:

https://valkyrie.yoctoproject.org/#/builders/73/builds/179
https://valkyrie.yoctoproject.org/#/builders/61/builds/181

Cheers,

Richard
Khem Raj Oct. 4, 2024, 7:19 a.m. UTC | #2 
On Thu, Oct 3, 2024 at 11:41 PM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Thu, 2024-10-03 at 16:01 -0700, Khem Raj via lists.openembedded.org
> wrote:
> > This patch is regressing on some distros where systemd
> > is used and /var/tmp is same as /var/volatime/tmp
> >
> > Removing this tweak also passes on poky. So I wonder
> > if we really need this patch anymore
>
> Removing it does not work on poky:
>
> https://valkyrie.yoctoproject.org/#/builders/73/builds/179
> https://valkyrie.yoctoproject.org/#/builders/61/builds/181
>

interesting, it works locally for me. but now I realized, I was using
glibc master, let me try to do it with stock poky.

> Cheers,
>
> Richard
diff mbox series

Patch

--- fdleak_cmsg.stderr.exp      2011-04-05 23:00:00.000000000 +0000
+++ fdleak_cmsg.stderr.out      2024-10-03 18:43:03.611527646 +0000
@@ -25,10 +25,10 @@ 

 FILE DESCRIPTORS: 6 open (3 std) at exit.
-Open file descriptor ...: ...
+Open file descriptor ...: /tmp/data2
    ...

-Open file descriptor ...: ...
+Open file descriptor ...: /tmp/data1
    ...

 Open AF_UNIX socket ...: <unknown>

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Alexander Kanavin <alex@linutronix.de>
---
 ...eak_cmsg.stderr.exp-adjust-tmp-paths.patch | 34 -------------------
 .../valgrind/valgrind_3.23.0.bb               |  1 -
 2 files changed, 35 deletions(-)
 delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.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
deleted file mode 100644
index e421ac6c801..00000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-From f405297d3382cd98391d02f397e2387da1f42879 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-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 <alex.kanavin@gmail.com>
----
- 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 (3 std) at exit.
--Open file descriptor ...: /tmp/data2
-+Open file descriptor ...: ...
-    ...
- 
--Open file descriptor ...: /tmp/data1
-+Open file descriptor ...: ...
-    ...
- 
- Open AF_UNIX socket ...: <unknown>
--- 
-2.17.1
-
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.23.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.23.0.bb
index 494a3c0df91..21beed94f2a 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.23.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.23.0.bb
@@ -31,7 +31,6 @@  SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
            file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \
            file://0001-memcheck-vgtests-remove-fullpath-after-flags.patch \
            file://s390x_vec_op_t.patch \
-           file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \
            file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \
            file://0001-docs-Disable-manual-validation.patch \
            file://0001-tests-arm-Use-O-instead-of-O0.patch \