strace: remove obsolete musl-on-MIPS patch
PATCH 1/2 strace: remove obsolete musl-on-MIPS patch
This patch was added as musl doesn't define SIGEMT on MIPS, but this was a mistake in musl and has been fixed in cabc369, available in musl 1.2.1 onwards (August 2020).
Signed-off-by Ross Burton <[email protected]>
--- .../strace/strace/mips-SIGEMT.patch | 33 ------------------- meta/recipes-devtools/strace/strace_5.16.bb | 1 - 2 files changed, 34 deletions(-) delete mode 100644 meta/recipes-devtools/strace/strace/mips-SIGEMT.patch
meta/recipes-devtools/strace/strace/mips-SIGEMT.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 794648d84672bbda30a920a05540b56cd155ed9d Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sun, 7 Aug 2016 23:47:57 -0700 -Subject: [PATCH] strace: Fix build with mips/mips64 on musl - -SIGEMT is not defined everywhere e.g musl does -not define it. Therefore check it being defined -before using it. - -Fixes errors e.g. -../../strace-4.13/tests/signal2name.c:45:7: error: 'SIGEMT' undeclared (first use in this function) - -Signed-off-by: Khem Raj <[email protected]> -Upstream-Status: Pending - ---- - tests/signal2name.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/signal2name.c b/tests/signal2name.c -index 1d8e7c5..6722aa1 100644 ---- a/tests/signal2name.c -+++ b/tests/signal2name.c -@@ -49,7 +49,9 @@ signal2name(int sig) - CASE(SIGEMT); - CASE(SIGLOST); - #elif defined MIPS -+#ifdef SIGEMT - CASE(SIGEMT); -+#endif - CASE(SIGIOT); - CASE(SIGPWR); - #else
meta/recipes-devtools/strace/strace_5.16.bb +0 -1
@@ -9,7 +9,6 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://update-gawk-paths.patch \ file://Makefile-ptest.patch \ file://run-ptest \ - file://mips-SIGEMT.patch \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://ptest-spacesave.patch \ file://0001-strace-fix-reproducibilty-issues.patch \
Signature · 1 line
2.25.1
PATCH 2/2 strace: skip a number of load-sensitive tests
Some tests are very load-sensitive as they depend on sleep() calls to take a precise amount of time. These will randomly fail in the automated QA, so skip them.
Signed-off-by Ross Burton <[email protected]>
--- .../strace/strace/skip-load.patch | 55 +++++++++++++++++++ meta/recipes-devtools/strace/strace_5.16.bb | 1 + 2 files changed, 56 insertions(+) create mode 100644 meta/recipes-devtools/strace/strace/skip-load.patch
meta/recipes-devtools/strace/strace/skip-load.patch new file +55 -0
@@ -0,0 +1,55 @@ +Skip tests which are known to be unreliable under load, typically because they +care about timing. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <[email protected]> + +diff --git a/tests/clock_nanosleep.gen.test b/tests/clock_nanosleep.gen.test +index 7a6025b..f0e6dbb 100755 +--- a/tests/clock_nanosleep.gen.test ++++ b/tests/clock_nanosleep.gen.test +@@ -1,4 +1,5 @@ + #!/bin/sh -efu + # Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (clock_nanosleep -e trace=clock_nanosleep,clock_gettime); do not edit. + . "${srcdir=.}/init.sh" ++skip_ "Test not reliable under load" + run_strace_match_diff -e trace=clock_nanosleep,clock_gettime +diff --git a/tests/delay.test b/tests/delay.test +index f74e27f..328087e 100755 +--- a/tests/delay.test ++++ b/tests/delay.test +@@ -9,6 +9,8 @@ + + . "${srcdir=.}/init.sh" + ++skip_ "Test not reliable under load" ++ + while read -r denter dexit denter_us dexit_us; do + [ -n "$denter" ] || continue + +diff --git a/tests/strace-T.test b/tests/strace-T.test +index adca3e8..d4acfe9 100755 +--- a/tests/strace-T.test ++++ b/tests/strace-T.test +@@ -9,6 +9,8 @@ + + . "${srcdir=.}/init.sh" + ++skip_ "Test not reliable under load" ++ + T_opt="${1:--T}" + + run_prog ../sleep 0 +diff --git a/tests/strace-r.test b/tests/strace-r.test +index 8299737..c360344 100755 +--- a/tests/strace-r.test ++++ b/tests/strace-r.test +@@ -9,6 +9,8 @@ + + . "${srcdir=.}/init.sh" + ++skip_ "Test not reliable under load" ++ + r_opt="${1:--r}" + + run_prog ../sleep 0
meta/recipes-devtools/strace/strace_5.16.bb +1 -0
@@ -12,6 +12,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://ptest-spacesave.patch \ file://0001-strace-fix-reproducibilty-issues.patch \ + file://skip-load.patch \ " SRC_URI[sha256sum] = "dc7db230ff3e57c249830ba94acab2b862da1fcaac55417e9b85041a833ca285"
Signature · 1 line
2.25.1