[PATCH 1/3] strace: remove obsolete patch

[PATCH 1/3] strace: remove obsolete patch

[Ross Burton]

This patch isn't needed with strace 5.14, which includes stdint.h
centrally.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../strace/strace/uintptr_t.patch             | 27 -------------------
 meta/recipes-devtools/strace/strace_5.14.bb   |  1 -
 2 files changed, 28 deletions(-)
 delete mode 100644 meta/recipes-devtools/strace/strace/uintptr_t.patch

diff --git a/meta/recipes-devtools/strace/strace/uintptr_t.patch b/meta/recipes-devtools/strace/strace/uintptr_t.patch
deleted file mode 100644
index 088d685af0..0000000000
--- a/meta/recipes-devtools/strace/strace/uintptr_t.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a6c9366bfbcef6f3f4bb068b1f1a5623935b5013 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 5 Nov 2019 20:05:08 -0800
-Subject: [PATCH] include stdint.h for getting uintptr_t definition
-
-fixes do_compile_ptest_base
-tests/fanotify_mark.c:191:23: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'?
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- tests/fanotify_mark.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c
-index aade643..de579f3 100644
---- a/tests/fanotify_mark.c
-+++ b/tests/fanotify_mark.c
-@@ -18,6 +18,7 @@
- 
- # include <limits.h>
- # include <stdio.h>
-+# include <stdint.h>
- # include <unistd.h>
- # include <sys/fanotify.h>
- 
diff --git a/meta/recipes-devtools/strace/strace_5.14.bb b/meta/recipes-devtools/strace/strace_5.14.bb
index 02a4843edf..a81bda04ba 100644
--- a/meta/recipes-devtools/strace/strace_5.14.bb
+++ b/meta/recipes-devtools/strace/strace_5.14.bb
@@ -12,7 +12,6 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            file://mips-SIGEMT.patch \
            file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
            file://ptest-spacesave.patch \
-           file://uintptr_t.patch \
            file://0001-strace-fix-reproducibilty-issues.patch \
            "
 SRC_URI[sha256sum] = "901bee6db5e17debad4530dd9ffb4dc9a96c4a656edbe1c3141b7cb307b11e73"
-- 
2.25.1

[PATCH 2/3] strace: handle loaded test systems

[Ross Burton]

If the host is loaded when running the tests there is a good chance
that strace-T.test will fail, as it does a sleep(1) and checks that
the nanosleep() call lasted for 0.9-1.1 seconds.

Relax the test so that the test passes if the call takes less than two
seconds.

[ YOCTO #14596 ]

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-devtools/strace/strace/ptest-sleep.patch | 7 +++++++
 meta/recipes-devtools/strace/strace_5.14.bb           | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 meta/recipes-devtools/strace/strace/ptest-sleep.patch

diff --git a/meta/recipes-devtools/strace/strace/ptest-sleep.patch b/meta/recipes-devtools/strace/strace/ptest-sleep.patch
new file mode 100644
index 0000000000..5629dec319
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace/ptest-sleep.patch
@@ -0,0 +1,7 @@
+diff --git a/tests/strace-T.expected b/tests/strace-T.expected
+index 1ea020465..f78d3e2c8 100644
+--- a/tests/strace-T.expected
++++ b/tests/strace-T.expected
+@@ -1 +1 @@
+-nanosleep\(\{tv_sec=1, tv_nsec=0\}, NULL\) = 0 <(1\.[01]|0\.9)[[:digit:]]{5}>
++nanosleep\(\{tv_sec=1, tv_nsec=0\}, NULL\) = 0 <(1\.|0\.9)[[:digit:]]{5}>
diff --git a/meta/recipes-devtools/strace/strace_5.14.bb b/meta/recipes-devtools/strace/strace_5.14.bb
index a81bda04ba..9ae1367337 100644
--- a/meta/recipes-devtools/strace/strace_5.14.bb
+++ b/meta/recipes-devtools/strace/strace_5.14.bb
@@ -13,6 +13,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://ptest-sleep.patch \
            "
 SRC_URI[sha256sum] = "901bee6db5e17debad4530dd9ffb4dc9a96c4a656edbe1c3141b7cb307b11e73"
 
-- 
2.25.1

[PATCH 3/3] strace: remove TOOLCHAIN assignment

[Ross Burton]

Back in 2016 strace failed to link when using clang, but this isn't the
case anymore.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-devtools/strace/strace_5.14.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-devtools/strace/strace_5.14.bb b/meta/recipes-devtools/strace/strace_5.14.bb
index 9ae1367337..5e02df9145 100644
--- a/meta/recipes-devtools/strace/strace_5.14.bb
+++ b/meta/recipes-devtools/strace/strace_5.14.bb
@@ -53,4 +53,3 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = "\
 "
 
 BBCLASSEXTEND = "native"
-TOOLCHAIN = "gcc"
-- 
2.25.1

Re: [OE-core] [PATCH 2/3] strace: handle loaded test systems

[Alexandre Belloni]

Hi Ross,

On 19/10/2021 20:26:13+0100, Ross Burton wrote:
> If the host is loaded when running the tests there is a good chance
> that strace-T.test will fail, as it does a sleep(1) and checks that
> the nanosleep() call lasted for 0.9-1.1 seconds.
> 
> Relax the test so that the test passes if the call takes less than two
> seconds.
> 
> [ YOCTO #14596 ]
> 
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta/recipes-devtools/strace/strace/ptest-sleep.patch | 7 +++++++
>  meta/recipes-devtools/strace/strace_5.14.bb           | 1 +
>  2 files changed, 8 insertions(+)
>  create mode 100644 meta/recipes-devtools/strace/strace/ptest-sleep.patch
> 
> diff --git a/meta/recipes-devtools/strace/strace/ptest-sleep.patch b/meta/recipes-devtools/strace/strace/ptest-sleep.patch
> new file mode 100644
> index 0000000000..5629dec319
> --- /dev/null
> +++ b/meta/recipes-devtools/strace/strace/ptest-sleep.patch
> @@ -0,0 +1,7 @@
> +diff --git a/tests/strace-T.expected b/tests/strace-T.expected
> +index 1ea020465..f78d3e2c8 100644
> +--- a/tests/strace-T.expected
> ++++ b/tests/strace-T.expected
> +@@ -1 +1 @@
> +-nanosleep\(\{tv_sec=1, tv_nsec=0\}, NULL\) = 0 <(1\.[01]|0\.9)[[:digit:]]{5}>
> ++nanosleep\(\{tv_sec=1, tv_nsec=0\}, NULL\) = 0 <(1\.|0\.9)[[:digit:]]{5}>

Those two builds have the patch and reliably failed:

https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/2425/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/2428/steps/12/logs/stdio

> diff --git a/meta/recipes-devtools/strace/strace_5.14.bb b/meta/recipes-devtools/strace/strace_5.14.bb
> index a81bda04ba..9ae1367337 100644
> --- a/meta/recipes-devtools/strace/strace_5.14.bb
> +++ b/meta/recipes-devtools/strace/strace_5.14.bb
> @@ -13,6 +13,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://ptest-sleep.patch \
>             "
>  SRC_URI[sha256sum] = "901bee6db5e17debad4530dd9ffb4dc9a96c4a656edbe1c3141b7cb307b11e73"
>  
> -- 
> 2.25.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#157202): https://lists.openembedded.org/g/openembedded-core/message/157202
> Mute This Topic: https://lists.openembedded.org/mt/86448553/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH 2/3] strace: handle loaded test systems

[Ross Burton]

Sigh.  I'll just remove the test entirely then.

Ross

On Thu, 21 Oct 2021 at 14:48, Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
>
> Hi Ross,
>
> On 19/10/2021 20:26:13+0100, Ross Burton wrote:
> > If the host is loaded when running the tests there is a good chance
> > that strace-T.test will fail, as it does a sleep(1) and checks that
> > the nanosleep() call lasted for 0.9-1.1 seconds.
> >
> > Relax the test so that the test passes if the call takes less than two
> > seconds.
> >
> > [ YOCTO #14596 ]
> >
> > Signed-off-by: Ross Burton <ross.burton@arm.com>
> > ---
> >  meta/recipes-devtools/strace/strace/ptest-sleep.patch | 7 +++++++
> >  meta/recipes-devtools/strace/strace_5.14.bb           | 1 +
> >  2 files changed, 8 insertions(+)
> >  create mode 100644 meta/recipes-devtools/strace/strace/ptest-sleep.patch
> >
> > diff --git a/meta/recipes-devtools/strace/strace/ptest-sleep.patch b/meta/recipes-devtools/strace/strace/ptest-sleep.patch
> > new file mode 100644
> > index 0000000000..5629dec319
> > --- /dev/null
> > +++ b/meta/recipes-devtools/strace/strace/ptest-sleep.patch
> > @@ -0,0 +1,7 @@
> > +diff --git a/tests/strace-T.expected b/tests/strace-T.expected
> > +index 1ea020465..f78d3e2c8 100644
> > +--- a/tests/strace-T.expected
> > ++++ b/tests/strace-T.expected
> > +@@ -1 +1 @@
> > +-nanosleep\(\{tv_sec=1, tv_nsec=0\}, NULL\) = 0 <(1\.[01]|0\.9)[[:digit:]]{5}>
> > ++nanosleep\(\{tv_sec=1, tv_nsec=0\}, NULL\) = 0 <(1\.|0\.9)[[:digit:]]{5}>
>
> Those two builds have the patch and reliably failed:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/2425/steps/12/logs/stdio
> https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/2428/steps/12/logs/stdio
>
> > diff --git a/meta/recipes-devtools/strace/strace_5.14.bb b/meta/recipes-devtools/strace/strace_5.14.bb
> > index a81bda04ba..9ae1367337 100644
> > --- a/meta/recipes-devtools/strace/strace_5.14.bb
> > +++ b/meta/recipes-devtools/strace/strace_5.14.bb
> > @@ -13,6 +13,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://ptest-sleep.patch \
> >             "
> >  SRC_URI[sha256sum] = "901bee6db5e17debad4530dd9ffb4dc9a96c4a656edbe1c3141b7cb307b11e73"
> >
> > --
> > 2.25.1
> >
>
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#157202): https://lists.openembedded.org/g/openembedded-core/message/157202
> > Mute This Topic: https://lists.openembedded.org/mt/86448553/3617179
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

Re: [OE-core] [PATCH 2/3] strace: handle loaded test systems

[Alexandre Belloni]

On 21/10/2021 15:20:04+0100, Ross Burton wrote:
> Sigh.  I'll just remove the test entirely then.

Actually, I think your regex is not correct because it also failed on
qemux86. I believe you are missing a digit in the case it takes more
than one second, before you had '1.[01]' then 5 digits, you changed it to
'1.' and 5 digits, this should be 6

> 
> Ross
> 
> On Thu, 21 Oct 2021 at 14:48, Alexandre Belloni
> <alexandre.belloni@bootlin.com> wrote:
> >
> > Hi Ross,
> >
> > On 19/10/2021 20:26:13+0100, Ross Burton wrote:
> > > If the host is loaded when running the tests there is a good chance
> > > that strace-T.test will fail, as it does a sleep(1) and checks that
> > > the nanosleep() call lasted for 0.9-1.1 seconds.
> > >
> > > Relax the test so that the test passes if the call takes less than two
> > > seconds.
> > >
> > > [ YOCTO #14596 ]
> > >
> > > Signed-off-by: Ross Burton <ross.burton@arm.com>
> > > ---
> > >  meta/recipes-devtools/strace/strace/ptest-sleep.patch | 7 +++++++
> > >  meta/recipes-devtools/strace/strace_5.14.bb           | 1 +
> > >  2 files changed, 8 insertions(+)
> > >  create mode 100644 meta/recipes-devtools/strace/strace/ptest-sleep.patch
> > >
> > > diff --git a/meta/recipes-devtools/strace/strace/ptest-sleep.patch b/meta/recipes-devtools/strace/strace/ptest-sleep.patch
> > > new file mode 100644
> > > index 0000000000..5629dec319
> > > --- /dev/null
> > > +++ b/meta/recipes-devtools/strace/strace/ptest-sleep.patch
> > > @@ -0,0 +1,7 @@
> > > +diff --git a/tests/strace-T.expected b/tests/strace-T.expected
> > > +index 1ea020465..f78d3e2c8 100644
> > > +--- a/tests/strace-T.expected
> > > ++++ b/tests/strace-T.expected
> > > +@@ -1 +1 @@
> > > +-nanosleep\(\{tv_sec=1, tv_nsec=0\}, NULL\) = 0 <(1\.[01]|0\.9)[[:digit:]]{5}>
> > > ++nanosleep\(\{tv_sec=1, tv_nsec=0\}, NULL\) = 0 <(1\.|0\.9)[[:digit:]]{5}>
> >
> > Those two builds have the patch and reliably failed:
> >
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/2425/steps/12/logs/stdio
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/2428/steps/12/logs/stdio
> >
> > > diff --git a/meta/recipes-devtools/strace/strace_5.14.bb b/meta/recipes-devtools/strace/strace_5.14.bb
> > > index a81bda04ba..9ae1367337 100644
> > > --- a/meta/recipes-devtools/strace/strace_5.14.bb
> > > +++ b/meta/recipes-devtools/strace/strace_5.14.bb
> > > @@ -13,6 +13,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://ptest-sleep.patch \
> > >             "
> > >  SRC_URI[sha256sum] = "901bee6db5e17debad4530dd9ffb4dc9a96c4a656edbe1c3141b7cb307b11e73"
> > >
> > > --
> > > 2.25.1
> > >
> >
> > >
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > > Links: You receive all messages sent to this group.
> > > View/Reply Online (#157202): https://lists.openembedded.org/g/openembedded-core/message/157202
> > > Mute This Topic: https://lists.openembedded.org/mt/86448553/3617179
> > > Group Owner: openembedded-core+owner@lists.openembedded.org
> > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > >
> >
> >
> > --
> > Alexandre Belloni, co-owner and COO, Bootlin
> > Embedded Linux and Kernel engineering
> > https://bootlin.com

-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH 2/3] strace: handle loaded test systems

[Ross Burton]

Ha, idiot me.  I didn't see that bit of the regex and the test suite
takes so long I didn't actually test it...

Other opinions on whether to we skip the test or relax the bounds?

Ross

On Thu, 21 Oct 2021 at 16:10, Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
>
> On 21/10/2021 15:20:04+0100, Ross Burton wrote:
> > Sigh.  I'll just remove the test entirely then.
>
> Actually, I think your regex is not correct because it also failed on
> qemux86. I believe you are missing a digit in the case it takes more
> than one second, before you had '1.[01]' then 5 digits, you changed it to
> '1.' and 5 digits, this should be 6
>
> >
> > Ross
> >
> > On Thu, 21 Oct 2021 at 14:48, Alexandre Belloni
> > <alexandre.belloni@bootlin.com> wrote:
> > >
> > > Hi Ross,
> > >
> > > On 19/10/2021 20:26:13+0100, Ross Burton wrote:
> > > > If the host is loaded when running the tests there is a good chance
> > > > that strace-T.test will fail, as it does a sleep(1) and checks that
> > > > the nanosleep() call lasted for 0.9-1.1 seconds.
> > > >
> > > > Relax the test so that the test passes if the call takes less than two
> > > > seconds.
> > > >
> > > > [ YOCTO #14596 ]
> > > >
> > > > Signed-off-by: Ross Burton <ross.burton@arm.com>
> > > > ---
> > > >  meta/recipes-devtools/strace/strace/ptest-sleep.patch | 7 +++++++
> > > >  meta/recipes-devtools/strace/strace_5.14.bb           | 1 +
> > > >  2 files changed, 8 insertions(+)
> > > >  create mode 100644 meta/recipes-devtools/strace/strace/ptest-sleep.patch
> > > >
> > > > diff --git a/meta/recipes-devtools/strace/strace/ptest-sleep.patch b/meta/recipes-devtools/strace/strace/ptest-sleep.patch
> > > > new file mode 100644
> > > > index 0000000000..5629dec319
> > > > --- /dev/null
> > > > +++ b/meta/recipes-devtools/strace/strace/ptest-sleep.patch
> > > > @@ -0,0 +1,7 @@
> > > > +diff --git a/tests/strace-T.expected b/tests/strace-T.expected
> > > > +index 1ea020465..f78d3e2c8 100644
> > > > +--- a/tests/strace-T.expected
> > > > ++++ b/tests/strace-T.expected
> > > > +@@ -1 +1 @@
> > > > +-nanosleep\(\{tv_sec=1, tv_nsec=0\}, NULL\) = 0 <(1\.[01]|0\.9)[[:digit:]]{5}>
> > > > ++nanosleep\(\{tv_sec=1, tv_nsec=0\}, NULL\) = 0 <(1\.|0\.9)[[:digit:]]{5}>
> > >
> > > Those two builds have the patch and reliably failed:
> > >
> > > https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/2425/steps/12/logs/stdio
> > > https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/2428/steps/12/logs/stdio
> > >
> > > > diff --git a/meta/recipes-devtools/strace/strace_5.14.bb b/meta/recipes-devtools/strace/strace_5.14.bb
> > > > index a81bda04ba..9ae1367337 100644
> > > > --- a/meta/recipes-devtools/strace/strace_5.14.bb
> > > > +++ b/meta/recipes-devtools/strace/strace_5.14.bb
> > > > @@ -13,6 +13,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://ptest-sleep.patch \
> > > >             "
> > > >  SRC_URI[sha256sum] = "901bee6db5e17debad4530dd9ffb4dc9a96c4a656edbe1c3141b7cb307b11e73"
> > > >
> > > > --
> > > > 2.25.1
> > > >
> > >
> > > >
> > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > > Links: You receive all messages sent to this group.
> > > > View/Reply Online (#157202): https://lists.openembedded.org/g/openembedded-core/message/157202
> > > > Mute This Topic: https://lists.openembedded.org/mt/86448553/3617179
> > > > Group Owner: openembedded-core+owner@lists.openembedded.org
> > > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > >
> > >
> > >
> > > --
> > > Alexandre Belloni, co-owner and COO, Bootlin
> > > Embedded Linux and Kernel engineering
> > > https://bootlin.com
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com