[PATCH v6 10/13] tests/wait4: Skip tests if __NR_wait4 syscall isn't defined

Dmitry V. Levin ldv at altlinux.org
Fri Apr 3 14:03:31 UTC 2020


On Wed, Apr 01, 2020 at 10:45:13AM -0700, Alistair Francis wrote:
> On Tue, Mar 31, 2020 at 5:01 PM Dmitry V. Levin <ldv at altlinux.org> wrote:
> >
> > On Fri, Mar 20, 2020 at 03:09:36PM -0700, Alistair Francis wrote:
> > > New y2038 safe 32-bit architectures don't have the __NR_wait4 syscall,
> > > so let's skip the test.
> > >
> > > Signed-off-by: Alistair Francis <alistair.francis at wdc.com>
> > > ---
> > >  tests/wait4.c | 35 ++++++++++++++++++++++-------------
> > >  1 file changed, 22 insertions(+), 13 deletions(-)
> > >
> > > diff --git a/tests/wait4.c b/tests/wait4.c
> > > index 29b0cadd..735a27c9 100644
> > > --- a/tests/wait4.c
> > > +++ b/tests/wait4.c
> > > @@ -9,12 +9,15 @@
> > >   */
> > >
> > >  #include "tests.h"
> > > -#include <assert.h>
> > > -#include <signal.h>
> > > -#include <stdio.h>
> > > -#include <unistd.h>
> > > -#include <sys/wait.h>
> > > -#include <sys/resource.h>
> > > +
> > > +#ifdef __NR_wait4
> >
> > Does it mean that wait4 entry should be moved from linux/32/syscallent.h
> > to linux/32/syscallent-time32.h?
> 
> Yep, fixed.

Apparently, gettimeofday and settimeofday were also missed.  I moved them
and wait4 in v5.5-172-g40eb6d930, so all this patch needs after all is
include "scno.h".


-- 
ldv


More information about the Strace-devel mailing list