From d7c9afbef0b440f5dbd16b3e8a3cb1ac5c513836 Mon Sep 17 00:00:00 2001 From: Randy MacLeod Date: Fri, 6 Oct 2023 14:27:51 -0700 Subject: [PATCH] strace: skip so_peerpidfd test The so_peerpidfd test is failing in every linux-yocto-6.5 ptest run due to a difference of square brackets in part of the log file. Skip the failing test until the difference is understood and fixed. Signed-off-by: Randy MacLeod Signed-off-by: Richard Purdie --- .../skip-test-so_peerpidfd.gen.test.patch | 25 +++++++++++++++++++ meta/recipes-devtools/strace/strace_6.5.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.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 new file mode 100644 index 00000000000..5c73e1f10e5 --- /dev/null +++ b/meta/recipes-devtools/strace/strace/skip-test-so_peerpidfd.gen.test.patch @@ -0,0 +1,25 @@ +From 002d9f2512245536dfc8d62db429d97e2216ec3a Mon Sep 17 00:00:00 2001 +From: Randy MacLeod +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 +--- + 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_6.5.bb b/meta/recipes-devtools/strace/strace_6.5.bb index 8f90c359255..d6475e8db9d 100644 --- a/meta/recipes-devtools/strace/strace_6.5.bb +++ b/meta/recipes-devtools/strace/strace_6.5.bb @@ -14,6 +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 \ " SRC_URI[sha256sum] = "dfb051702389e1979a151892b5901afc9e93bbc1c70d84c906ade3224ca91980" -- 2.47.2