tests: finish ptrace_setoptions_* merge

* tests/Makefile.am (TESTS): Merge ptrace_setoptions_*.
* tests/ptrace_setoptions: Check for Linux kernel > 2.6.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 23472b823f222069ff90b5f2f487eb67de84cd1e..93636ca8fb857a8f12e4f30957252e1146763261 100644 (file)
--- 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 57e92b65dd2a1cdbe5e7dca223e22f52c24b4358..7afd0436eb043030c84a7f86726f5fb28255745e 100755 (executable)
--- 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