strace: increase ptest timeout from 240 to 600 seconds
PATCH 1/2 strace: increase ptest timeout from 240 to 600 seconds
From: Randy MacLeod <[email protected]>
Increase timeout to from 240 to 600 seconds for the following slow tests:
filtering_syscall-syntax, qual_fault-syscall, qual_fault
--- meta/recipes-devtools/strace/strace/run-ptest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/strace/strace/run-ptest +1 -1
@@ -2,7 +2,7 @@ set -u -export TIMEOUT_DURATION=240 +export TIMEOUT_DURATION=600 make -j4 -B -C tests -k test-suite.log res=$? if [ $res -ne 0 ]; then
Signature · 1 line
2.34.1
PATCH 2/2 strace: update from 6.11 to 6.12
From: Randy MacLeod <[email protected]>
Release highlights:
https://github.com/strace/strace/releases/tag/v6.12
Drop patch merged upstream:
0001-sched_attr-Define-conditionally-on-SCHED_ATTR_SIZE_V.patch
3b6f69aa2 sched_attr: Define conditionally on SCHED_ATTR_SIZE_VER1
qemux86-64 ptest results:
glibc musl:
TOTAL: 1393 1393 PASS: 1066 1059 SKIP: 327 330 XFAIL: 0 0 FAIL: 0 4 XPASS: 0 0 ERROR: 0 0
The skipped tests are mostly SELinux.
The musl tests that fail, currently for unknown reasons, are:
pread64-pwrite64.gen
preadv-pwritev.gen
pwritev.gen
uio
At least for pread64-pwrite6 the pwrite(64) syscalls are not traced and that makes the test fail.
---
...e-conditionally-on-SCHED_ATTR_SIZE_V.patch | 49 -------------------
.../strace/{strace_6.11.bb => strace_6.12.bb} | 4 +-
2 files changed, 2 insertions(+), 51 deletions(-)
delete mode 100644 meta/recipes-devtools/strace/strace/0001-sched_attr-Define-conditionally-on-SCHED_ATTR_SIZE_V.patch
rename meta/recipes-devtools/strace/{strace_6.11.bb => strace_6.12.bb} (93%)meta/recipes-devtools/strace/strace/0001-sched_attr-Define-conditionally-on-SCHED_ATTR_SIZE_V.patch deleted +0 -49
@@ -1,49 +0,0 @@ -From d162a1d6b18348955f9989f150c86a68af096362 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 30 Sep 2024 15:17:16 -0700 -Subject: [PATCH] sched_attr: Define conditionally on SCHED_ATTR_SIZE_VER0 - -glibc 2.41+ has added [1] definitions for sched_setattr and sched_getattr functions -and struct sched_attr. Therefore, it needs to be checked for here as well before -defining sched_attr - -Fixes builds with glibc/trunk - -In file included from ../../strace-6.11/src/sched.c:14: -../../strace-6.11/src/sched_attr.h:16:8: error: redefinition of 'sched_attr' - 16 | struct sched_attr { - | ^ -/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/strace/6.11/recipe-sysroot/usr/include/linux/sched/types.h:98:8: note: previous definition is here - 98 | struct sched_attr { - | ^ - -[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8 - -Upstream-Status: Submitted [https://github.com/strace/strace/pull/318] -Signed-off-by: Khem Raj <[email protected]> ---- - src/sched_attr.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/sched_attr.h b/src/sched_attr.h -index 26c53172f..a5b5d94ce 100644 ---- a/src/sched_attr.h -+++ b/src/sched_attr.h -@@ -11,6 +11,8 @@ - - # include <stdint.h> - -+# ifndef SCHED_ATTR_SIZE_VER0 -+ - struct sched_attr { - uint32_t size; - uint32_t sched_policy; -@@ -25,6 +27,8 @@ struct sched_attr { - uint32_t sched_util_max; - }; - -+# endif /* SCHED_ATTR_SIZE_VER0 */ -+ - # define SCHED_ATTR_MIN_SIZE 48 - # ifndef SCHED_ATTR_SIZE_VER1 - # define SCHED_ATTR_SIZE_VER1 56
meta/recipes-devtools/strace/strace_6.12.bb renamed from meta/recipes-devtools/strace/strace_6.11.bb +2 -2
@@ -14,9 +14,9 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${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://0001-sched_attr-Define-conditionally-on-SCHED_ATTR_SIZE_V.patch \ " -SRC_URI[sha256sum] = "83262583a3529f02c3501aa8b8ac772b4cbc03dc934e98bab6e4883626e283a5" +SRC_URI[sha256sum] = "c47da93be45b6055f4dc741d7f20efaf50ca10160a5b100c109b294fd9c0bdfe" + inherit autotools github-releases ptest
Signature · 1 line
2.34.1