[prev in list] [next in list] [prev in thread] [next in thread]
List: openembedded-core
Subject: Re: [OE-core] [PATCH] strace: backport fix for so_peerpidfd-test
From: "Randy MacLeod via lists.openembedded.org" <randy.macleod=windriver.com () lists ! op
Date: 2023-10-31 23:51:24
Message-ID: e9d4b6fd-03c9-4538-8b9b-52f006d9cf99 () windriver ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
On 2023-10-31 7:47 p.m., Randy MacLeod via lists.openembedded.org wrote:
> From: Randy MacLeod<Randy.MacLeod@windriver.com>
>
> Backport the fix for the so_peerpidfd-test:
> 44cf51a38 tests: fix so_peerpidfd test
> and drop the patch that skipped that test.
Note that options-syntax.test failed with the default qemux86-64/kvm memory
size but works with 1024 MB.
../Randy
>
> Signed-off-by: Randy MacLeod<Randy.MacLeod@windriver.com>
> ---
> .../skip-test-so_peerpidfd.gen.test.patch | 25 ---------------
> .../strace/tests-fix-so_peerpidfd-test.patch | 32 +++++++++++++++++++
> meta/recipes-devtools/strace/strace_6.5.bb | 2 +-
> 3 files changed, 33 insertions(+), 26 deletions(-)
> delete mode 100644 \
> meta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.test.patch create \
> mode 100644 meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch
> diff --git a/meta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.test.patch \
> b/meta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.test.patch deleted \
> file mode 100644 index 5c73e1f10e..0000000000
> --- a/meta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.test.patch
> +++ /dev/null
> @@ -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
> -
> diff --git a/meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch \
> b/meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch new file \
> mode 100644 index 0000000000..62f73d3643
> --- /dev/null
> +++ b/meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch
> @@ -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
> +
> diff --git a/meta/recipes-devtools/strace/strace_6.5.bb \
> b/meta/recipes-devtools/strace/strace_6.5.bb index d6475e8db9..d1536b1e8d 100644
> --- a/meta/recipes-devtools/strace/strace_6.5.bb
> +++ b/meta/recipes-devtools/strace/strace_6.5.bb
> @@ -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"
>
>
>
--
# Randy MacLeod
# Wind River Linux
[Attachment #5 (text/html)]
<!DOCTYPE html><html><head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body>
<div class="moz-cite-prefix">On 2023-10-31 7:47 p.m., Randy MacLeod
via lists.openembedded.org wrote:<br>
</div>
<blockquote type="cite" cite="mid:179355FD3F4001E8.25237@lists.openembedded.org">
<pre class="moz-quote-pre" wrap="">From: Randy MacLeod <a \
class="moz-txt-link-rfc2396E" \
href="mailto:Randy.MacLeod@windriver.com"><Randy.MacLeod@windriver.com></a>
Backport the fix for the so_peerpidfd-test:
44cf51a38 tests: fix so_peerpidfd test
and drop the patch that skipped that test.</pre>
</blockquote>
Note that options-syntax.test failed with the default qemux86-64/kvm
memory<br>
<p>size but works with 1024 MB.</p>
<p>../Randy<br>
</p>
<blockquote type="cite" cite="mid:179355FD3F4001E8.25237@lists.openembedded.org">
<pre class="moz-quote-pre" wrap="">
Signed-off-by: Randy MacLeod <a class="moz-txt-link-rfc2396E" \
href="mailto:Randy.MacLeod@windriver.com"><Randy.MacLeod@windriver.com></a>
---
.../skip-test-so_peerpidfd.gen.test.patch | 25 ---------------
.../strace/tests-fix-so_peerpidfd-test.patch | 32 +++++++++++++++++++
meta/recipes-devtools/strace/strace_6.5.bb | 2 +-
3 files changed, 33 insertions(+), 26 deletions(-)
delete mode 100644 meta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.test.patch
create mode 100644 \
meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch
diff --git a/meta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.test.patch \
b/meta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.test.patch deleted \
file mode 100644 index 5c73e1f10e..0000000000
--- a/meta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 002d9f2512245536dfc8d62db429d97e2216ec3a Mon Sep 17 00:00:00 2001
-From: Randy MacLeod <a class="moz-txt-link-rfc2396E" \
href="mailto:Randy.MacLeod@windriver.com"><Randy.MacLeod@windriver.com></a>
-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 <a class="moz-txt-link-rfc2396E" \
href="mailto:Randy.MacLeod@windriver.com"><Randy.MacLeod@windriver.com></a>
----
- 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
-
diff --git a/meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch \
b/meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch new file mode \
100644 index 0000000000..62f73d3643
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch
@@ -0,0 +1,32 @@
+From 44cf51a38cce1e90bb6c22208fa45f95cdcc8f5d Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <a class="moz-txt-link-rfc2396E" \
href="mailto:ldv@strace.io"><ldv@strace.io></a> +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: <a class="moz-txt-link-freetext" \
href="https://bugzilla.redhat.com/show_bug.cgi?id=2243631">https://bugzilla.redhat.com/show_bug.cgi?id=2243631</a>
+
+Upstream-Status: Backport [<a class="moz-txt-link-freetext" \
href="https://github.com/strace/strace/commit/44cf51a38cce1e90bb6c22208fa45f95cdcc8f5d \
">https://github.com/strace/strace/commit/44cf51a38cce1e90bb6c22208fa45f95cdcc8f5d</a>]
+Signed-off-by: Randy MacLeod <a class="moz-txt-link-rfc2396E" \
href="mailto:Randy.MacLeod@windriver.com"><Randy.MacLeod@windriver.com></a> \
+--- + 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
+
diff --git a/meta/recipes-devtools/strace/strace_6.5.bb \
b/meta/recipes-devtools/strace/strace_6.5.bb index d6475e8db9..d1536b1e8d 100644
--- a/meta/recipes-devtools/strace/strace_6.5.bb
+++ b/meta/recipes-devtools/strace/strace_6.5.bb
@@ -14,7 +14,7 @@ SRC_URI = <a class="moz-txt-link-rfc2396E" \
href="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-Repl \
ace-off64_t-with-off_t.patch\-file://skip-test-so_peerpidfd.gen.test.patch\+file://tes \
ts-fix-so_peerpidfd-test.patch\">"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 \
"</a>
SRC_URI[sha256sum] = \
"dfb051702389e1979a151892b5901afc9e93bbc1c70d84c906ade3224ca91980"
</pre>
<br>
<fieldset class="moz-mime-attachment-header"></fieldset>
<pre class="moz-quote-pre" wrap="">
</pre>
</blockquote>
<p><br>
</p>
<pre class="moz-signature" cols="72">--
# Randy MacLeod
# Wind River Linux</pre>
</body>
</html>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#189891): https://lists.openembedded.org/g/openembedded-core/message/189891
Mute This Topic: https://lists.openembedded.org/mt/102309591/4454766
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [openembedded-core@marc.info]
-=-=-=-=-=-=-=-=-=-=-=-
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic