strace: backport fix for so_peerpidfd-test
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 5 lines · Randy MacLeod via lists.openembedded.org
From: Randy MacLeod<[email protected]>
Backport the fix for the so_peerpidfd-test:
44cf51a38tests: fixso_peerpidfdtest
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
Quoted 96 lines
Signed-off-by Randy MacLeod<[email protected]>--- .../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.patchcreate mode 100644meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patchmeta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.test.patch deleted +0
-25@@ -1,25 +0,0 @@ -From 002d9f2512245536dfc8d62db429d97e2216ec3a Mon Sep 17 00:00:00 2001 -From: Randy MacLeod<[email protected]> -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<[email protected]> ---- - 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 -meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch new file +32
-0@@ -0,0 +1,32 @@ +From 44cf51a38cce1e90bb6c22208fa45f95cdcc8f5d Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin"<[email protected]> +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<[email protected]> +--- + 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 +meta/recipes-devtools/strace/strace_6.5.bb +0
-0@@ -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"-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#189890):https://lists.openembedded.org/g/openembedded-core/message/189890 Mute This Topic:https://lists.openembedded.org/mt/102309591/3616765
Group Owner:[email protected] Unsubscribe:https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 2 lines
# Randy MacLeod # Wind River Linux
PATCH 1/1 strace: upgrade 6.5 -> 6.6
In reply to a message not in the archiveFrom: Randy MacLeod <[email protected]>
Update the COPYING checksum; only the copyright date changed.
Noteworthy changes in strace 6.6 (2023-10-31)
=============================================
* Improvements
* Implemented --kill-on-exit option that instructs the tracer to set PTRACE_O_EXITKILL option to all tracee processes and not to detach them on cleanup so they will not be left running after the tracer exit.
* Implemented automatic activation of --kill-on-exit option when --seccomp-bpf is enabled and -p/--attach option is not used.
* Implemented decoding of map_shadow_stack syscall.
* Implemented decoding of FSCONFIG_CMD_CREATE_EXCL fsconfig command.
* Implemented decoding of IFLA_BRPORT_BACKUP_NHID netlink attribute.
* Implemented decoding of SECCOMP_IOCTL_NOTIF_SET_FLAGS ioctl.
* Implemented decoding of UFFDIO_CONTINUE, UFFDIO_POISON, and UFFDIO_WRITEPROTECT ioctls.
* Updated lists of ARCH_*, BPF_*, DEVCONF_*, IORING_*, KEXEC_*, MAP_*, NT_*,
PTRACE_*, QFMT_*, SEGV_*, UFFD_*, V4L2_*, and XDP_* constants.
* Updated lists of ioctl commands from Linux 6.6.
ptest-runner results on qemux86-64/kvm with qemuparms="-m 1024 -smp 4":
============================================================================
Testsuite summary for strace 6.6
============================================================================
============================================================================
---
.../strace/tests-fix-so_peerpidfd-test.patch | 32 -------------------
.../strace/{strace_6.5.bb => strace_6.6.bb} | 5 ++-
2 files changed, 2 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch
rename meta/recipes-devtools/strace/{strace_6.5.bb => strace_6.6.bb} (90%)meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 44cf51a38cce1e90bb6c22208fa45f95cdcc8f5d Mon Sep 17 00:00:00 2001 -From: "Dmitry V. Levin" <[email protected]> -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 <[email protected]> ---- - 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 -
meta/recipes-devtools/strace/strace_6.6.bb renamed from meta/recipes-devtools/strace/strace_6.5.bb +2 -3
@@ -3,7 +3,7 @@ HOMEPAGE = "http://strace.io" DESCRIPTION = "strace is a diagnostic, debugging and instructional userspace utility for Linux. It is used to monitor and tamper with interactions between processes and the Linux kernel, which include system calls, signal deliveries, and changes of process state." SECTION = "console/utils" LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=59a33f0a3e6122d67c0b3befccbdaa6b" +LIC_FILES_CHKSUM = "file://COPYING;md5=63c8c3eb5c71b4362edac1397f40bdc7" SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://update-gawk-paths.patch \
@@ -14,9 +14,8 @@ 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://tests-fix-so_peerpidfd-test.patch \ " -SRC_URI[sha256sum] = "dfb051702389e1979a151892b5901afc9e93bbc1c70d84c906ade3224ca91980" +SRC_URI[sha256sum] = "421b4186c06b705163e64dc85f271ebdcf67660af8667283147d5e859fc8a96c" inherit autotools ptest
Signature · 1 line
2.42.0