Fix tests/ptrace_setoptions_* to match last fix in ptrace options code

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

diff --git a/tests/ptrace_setoptions b/tests/ptrace_setoptions
new file mode 100755 (executable)
index 0000000..57e92b6
--- /dev/null
+++ b/tests/ptrace_setoptions
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Ensure that strace tests kernel PTRACE_O_TRACECLONE support properly.
+
+. "${srcdir=.}/init.sh"
+
+case "$(uname -rs)" in
+       Linux\ 2.6.*) ;;
+       *) skip_ 'The kernel is not Linux 2.6.*' ;;
+esac
+
+check_strace
+check_prog timeout
+
+timeout -s 9 9 \
+$STRACE -df -enone / 2>&1 |
+       grep -F -x 'ptrace_setoptions = 0xe' > /dev/null ||
+               fail_ 'strace -f failed to recognize proper kernel PTRACE_O_TRACECLONE support'
+
+timeout -s 9 9 \
+$STRACE -df -enone / 2>&1 |
+       grep -F -x 'ptrace_setoptions = 0x1f' > /dev/null ||
+               fail_ 'strace -f failed to recognize proper kernel PTRACE_O_TRACESYSGOOD support'
+
+timeout -s 9 9 \
+$STRACE -d -enone / 2>&1 |
+       grep -F -x 'ptrace_setoptions = 0x11' > /dev/null ||
+               fail_ 'strace failed to recognize proper kernel PTRACE_O_TRACESYSGOOD support'

diff --git a/tests/ptrace_setoptions_followfork b/tests/ptrace_setoptions_followfork
deleted file mode 100755 (executable)
index bb25c03..0000000
--- a/tests/ptrace_setoptions_followfork
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Ensure that strace tests kernel PTRACE_O_TRACECLONE support properly.
-
-. "${srcdir=.}/init.sh"
-
-[ "$(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
-check_prog timeout
-
-timeout -s 9 9 \
-$STRACE -df -enone / 2>&1 |
-       grep -F -x 'ptrace_setoptions_followfork = 0xe' > /dev/null ||
-               fail_ 'strace failed to recognize proper kernel PTRACE_O_TRACECLONE support'

diff --git a/tests/ptrace_setoptions_for_all b/tests/ptrace_setoptions_for_all
deleted file mode 100755 (executable)
index 1625c00..0000000
--- a/tests/ptrace_setoptions_for_all
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Ensure that strace tests kernel PTRACE_O_TRACESYSGOOD support properly.
-
-. "${srcdir=.}/init.sh"
-
-[ "$(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
-check_prog timeout
-
-timeout -s 9 9 \
-$STRACE -d -enone / 2>&1 |
-       grep -F -x 'ptrace_setoptions_for_all = 0x11' > /dev/null ||
-               fail_ 'strace failed to recognize proper kernel PTRACE_O_TRACESYSGOOD support'