[PATCH] tests: Split out delay

Alistair Francis alistair23 at gmail.com
Wed Mar 4 01:35:21 UTC 2020


On Tue, Mar 3, 2020 at 5:34 PM Alistair Francis
<alistair.francis at wdc.com> wrote:
>
> The delay test uses the gettimeofday. The gettimeofday does not exist on
> new 32-bit architectures that have been added since the 5.1 kernel
> (__ARCH_WANT_TIME32_SYSCALLS is not defined).
>
> To avoid running tests for syscalls the kernel doesn't support let's
> make the delay test dependent on supporting the older syscalls.
>
> As new architectures are added (and maybe older ones removed) they will
> need to set kern_5_1_syscalls_only to "xyes".
>
> Signed-off-by: Alistair Francis <alistair.francis at wdc.com>

Argh, I'm pretty sure I can just use SKIP_MAIN_UNDEFINED.

Just ignore this patch.

Alistair

> ---
>  configure.ac      |  2 ++
>  tests/Makefile.am | 13 ++++++++++---
>  2 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index e6fc3b1e..678a0ae5 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -203,6 +203,8 @@ xtensa*)
>  esac
>  AC_MSG_RESULT($arch)
>
> +AM_CONDITIONAL([KERN_5_1_SYSCALLS_ONLY], [test "x$kern_5_1_syscalls_only" == xyes])
> +
>  arch_native=$arch
>
>  test -n "$arch_m32" ||
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index f2a5bc6d..9bb14dc0 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -70,7 +70,12 @@ LDADD = libtests.a
>
>  include pure_executables.am
>
> +if KERN_5_1_SYSCALLS_ONLY
> +PRE_5_1_EXECUTABLES = delay
> +endif
> +
>  check_PROGRAMS = $(PURE_EXECUTABLES) \
> +       $(PRE_5_1_EXECUTABLES) \
>         _newselect-P \
>         answer \
>         attach-f-p \
> @@ -103,7 +108,6 @@ check_PROGRAMS = $(PURE_EXECUTABLES) \
>         clone3-success-Xraw \
>         clone3-success-Xverbose \
>         count-f \
> -       delay \
>         execve-v \
>         execveat-v \
>         filter_seccomp-flag \
> @@ -338,14 +342,17 @@ DECODER_TESTS = \
>         xet_thread_area_x86.test \
>         # end of DECODER_TESTS
>
> -MISC_TESTS = \
> +if KERN_5_1_SYSCALLS_ONLY
> +PRE_5_1_TESTS = delay.test
> +endif
> +
> +MISC_TESTS = $(PRE_5_1_TESTS) \
>         attach-f-p.test \
>         attach-p-cmd.test \
>         bexecve.test \
>         clone_ptrace.test \
>         count-f.test \
>         count.test \
> -       delay.test \
>         detach-running.test \
>         detach-sleeping.test \
>         detach-stopped.test \
> --
> 2.25.1
>


More information about the Strace-devel mailing list