From: Dmitry V. Levin <ldv@altlinux.org>
Date: Mon, 27 Jul 2015 12:34:58 +0000 (+0000)
Subject: tests/restart_syscall: skip if nanosleep looks uninterrupted
X-Git-Tag: v4.11~323
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=afa10d877c2a646a347ab33848d906e95ec94ac1;p=strace

tests/restart_syscall: skip if nanosleep looks uninterrupted

* tests/restart_syscall.test: Skip if restart_syscall is not detected
and nanosleep syscall looks uninterrupted.
---

diff --git a/tests/restart_syscall.test b/tests/restart_syscall.test
index 5ae3a1d5..1daa3165 100755
--- a/tests/restart_syscall.test
+++ b/tests/restart_syscall.test
@@ -7,12 +7,17 @@
 check_prog sleep
 check_prog grep
 run_strace -enanosleep sleep 1
-grep nanosleep < "$LOG" > /dev/null ||
+LC_ALL=C grep ^nanosleep < "$LOG" > /dev/null ||
 	framework_skip_ 'sleep does not use nanosleep'
 
 ./set_ptracer_any sleep 2 &
 sleep 1
-run_strace -q -erestart_syscall -p $!
+run_strace -q -erestart_syscall,nanosleep -p $!
+
+LC_ALL=C grep ^restart_syscall < "$LOG" > /dev/null ||
+if LC_ALL=C grep -x 'nanosleep({2, 0}, NULL) \+= 0' < "$LOG" > /dev/null; then
+	skip_ 'no restart_syscall, uninterrupted nanosleep'
+fi
 
 case "$STRACE_ARCH" in
 	alpha|mips|or1k|s390|s390x)