tests: raise strace check timeout to 60 seconds

* tests/init.sh (check_timeout): New variable.
* tests/ptrace_setoptions: Use it.
* tests/strace-f: Likewise.

Reported-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/tests/init.sh b/tests/init.sh
index b0dbbf8461924f765f0cb8d1c697deb85990f025..f860b0b079470934619f799e79586f80e6e59fc3 100644 (file)
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -2,6 +2,8 @@
 
 ME_="${0##*/}"
 
+check_timeout=60
+
 warn_() { printf >&2 '%s\n' "$*"; }
 fail_() { warn_ "$ME_: failed test: $*"; exit 1; }
 skip_() { warn_ "$ME_: skipped test: $*"; exit 77; }

diff --git a/tests/ptrace_setoptions b/tests/ptrace_setoptions
index 7afd0436eb043030c84a7f86726f5fb28255745e..7511047cf9f9d56ead252fc4da6214725d20e65e 100755 (executable)
--- a/tests/ptrace_setoptions
+++ b/tests/ptrace_setoptions
@@ -15,17 +15,17 @@ esac
 check_strace
 check_prog timeout
 
-timeout -s 9 9 \
+timeout -s 9 $check_timeout \
 $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 \
+timeout -s 9 $check_timeout \
 $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 \
+timeout -s 9 $check_timeout \
 $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/strace-f b/tests/strace-f
index 869f331df78c4d3dcf2c46a72c74b101047a3da2..7b395526be19dba74c2faf8eff3279345a312677 100755 (executable)
--- a/tests/strace-f
+++ b/tests/strace-f
@@ -9,6 +9,6 @@ check_prog timeout
 time=/usr/bin/time
 check_prog $time
 
-timeout -s 9 9 \
+timeout -s 9 $check_timeout \
 $STRACE -f $time /bin/ls > check.log 2>&1 ||
        { cat check.log; fail_ 'strace -f does not work'; }