diff options
author | Dmitry V. Levin <ldv@altlinux.org> | 2012-05-01 21:32:09 +0000 |
---|---|---|
committer | Dmitry V. Levin <ldv@altlinux.org> | 2012-05-01 21:32:09 +0000 |
commit | 823eba28cd7a0e0cedf9bb3cd4e7f3765ceb2ef8 (patch) | |
tree | 8f5e983daa4ef462c917d5e4698bacd24c5001fa /tests | |
parent | a28fbfd523f9758438985847cf9cd6b9c08433b1 (diff) | |
download | strace-823eba28cd7a0e0cedf9bb3cd4e7f3765ceb2ef8.tar.gz strace-823eba28cd7a0e0cedf9bb3cd4e7f3765ceb2ef8.tar.bz2 strace-823eba28cd7a0e0cedf9bb3cd4e7f3765ceb2ef8.tar.xz |
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>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/init.sh | 2 | ||||
-rwxr-xr-x | tests/ptrace_setoptions | 6 | ||||
-rwxr-xr-x | tests/strace-f | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/tests/init.sh b/tests/init.sh index b0dbbf8..f860b0b 100644 --- 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 7afd043..7511047 100755 --- 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 869f331..7b39552 100755 --- 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'; } |