diff options
author | Dmitry V. Levin <ldv@altlinux.org> | 2011-06-09 18:23:09 +0000 |
---|---|---|
committer | Dmitry V. Levin <ldv@altlinux.org> | 2011-06-21 15:03:17 +0000 |
commit | d1d182209ea010f52bcf903739e7dbe0385e0021 (patch) | |
tree | 105f4210b21cd22332439c413809f9d336351584 | |
parent | b56d6d3bfeeb8889ea18105033acfba6f3fcbf51 (diff) | |
download | strace-d1d182209ea010f52bcf903739e7dbe0385e0021.tar.gz strace-d1d182209ea010f52bcf903739e7dbe0385e0021.tar.bz2 strace-d1d182209ea010f52bcf903739e7dbe0385e0021.tar.xz |
tests: finish ptrace_setoptions_* merge
* tests/Makefile.am (TESTS): Merge ptrace_setoptions_*.
* tests/ptrace_setoptions: Check for Linux kernel > 2.6.
-rw-r--r-- | tests/Makefile.am | 2 | ||||
-rwxr-xr-x | tests/ptrace_setoptions | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 23472b8..93636ca 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,6 @@ # Automake input for strace tests. -TESTS = ptrace_setoptions_followfork ptrace_setoptions_for_all strace-f +TESTS = ptrace_setoptions strace-f EXTRA_DIST = init.sh $(TESTS) diff --git a/tests/ptrace_setoptions b/tests/ptrace_setoptions index 57e92b6..7afd043 100755 --- a/tests/ptrace_setoptions +++ b/tests/ptrace_setoptions @@ -1,12 +1,15 @@ #!/bin/sh -# Ensure that strace tests kernel PTRACE_O_TRACECLONE support properly. +# Ensure that strace tests kernel PTRACE_O_TRACECLONE +# and PTRACE_O_TRACESYSGOOD support properly. . "${srcdir=.}/init.sh" -case "$(uname -rs)" in - Linux\ 2.6.*) ;; - *) skip_ 'The kernel is not Linux 2.6.*' ;; +[ "$(uname -s)" = Linux ] || + skip_ 'The kernel is not a Linux kernel' +case "$(uname -r)" in + 2.[6-9]*|2.[1-5][0-9]*|[3-9].*|[12][0-9]*) ;; + *) skip_ 'The kernel is not Linux 2.6.* or newer' ;; esac check_strace |