mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-21 00:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

strace: backport fix for so_peerpidfd-test

Browse Source 
Backport the fix for the so_peerpidfd-test:
   44cf51a38 tests: fix so_peerpidfd test
and drop the patch that skipped that test.

(From OE-Core rev: 40127d0427d02d0c44d17b9959c5eae4d91d3f10)

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 0a52da6530ebba08f9a3b30d5098b0c3ef1730d7)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Randy MacLeod
2023-10-31 19:47:08 -04:00
committed by Steve Sakoman
parent 16bb0a1ced
commit 7ba45d212e
3 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
meta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.test.patch
View File

@@ -1,25 +0,0 @@
From 002d9f2512245536dfc8d62db429d97e2216ec3a Mon Sep 17 00:00:00 2001
From: Randy MacLeod <Randy.MacLeod@windriver.com>
Date: Fri, 6 Oct 2023 12:08:23 -0700
Subject: [PATCH] skip tests/so_peerpidfd.gen.test
Upstream-Status: Inappropriate
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
tests/so_peerpidfd.gen.test | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/so_peerpidfd.gen.test b/tests/so_peerpidfd.gen.test
index 64ad3a2..f89da9f 100755
--- a/tests/so_peerpidfd.gen.test
+++ b/tests/so_peerpidfd.gen.test
@@ -1,4 +1,5 @@
#!/bin/sh -efu
# Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (so_peerpidfd --trace=getsockopt -y); do not edit.
. "${srcdir=.}/init.sh"
+skip_ "Test fails due to apparently trivial log format differences"
run_strace_match_diff --trace=getsockopt -y
--
2.39.0

32
meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch Normal file
View File

@@ -0,0 +1,32 @@
From 44cf51a38cce1e90bb6c22208fa45f95cdcc8f5d Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@strace.io>
Date: Sat, 14 Oct 2023 08:00:00 +0000
Subject: [PATCH] tests: fix so_peerpidfd test
* tests/so_peerpidfd.c (print_pidfd): Fix expected output.
Fixes: v6.5~38 "net: implement decoding of SO_PEERPIDFD socket option"
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2243631
Upstream-Status: Backport [https://github.com/strace/strace/commit/44cf51a38cce1e90bb6c22208fa45f95cdcc8f5d]
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
tests/so_peerpidfd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/so_peerpidfd.c b/tests/so_peerpidfd.c
index 33988edec..dfad1c434 100644
--- a/tests/so_peerpidfd.c
+++ b/tests/so_peerpidfd.c
@@ -37,7 +37,7 @@ print_pidfd(int *p)
if (rc < 0)
printf("%p", p);
else
- printf("%d%s", *p, pidfd_suffix);
+ printf("[%d%s]", *p, pidfd_suffix);
}
static void
--
2.34.1

2
meta/recipes-devtools/strace/strace_6.5.bb
View File

@@ -14,7 +14,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
file://skip-load.patch \
file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \
file://0002-tests-Replace-off64_t-with-off_t.patch \
file://skip-test-so_peerpidfd.gen.test.patch \
file://tests-fix-so_peerpidfd-test.patch \
"
SRC_URI[sha256sum] = "dfb051702389e1979a151892b5901afc9e93bbc1c70d84c906ade3224ca91980"