Remove XLAT_END

[strace] / tests / count.test

diff --git a/tests/count.test b/tests/count.test
index 9c53fe24bcc5db03839c56deb553371868d757df..2a8a73613e7875182c31290ded981bf78de43a92 100755 (executable)
--- a/tests/count.test
+++ b/tests/count.test
@@ -1,17 +1,23 @@
 #!/bin/sh
-
+#
 # Check whether -c and -w options work.
+#
+# Copyright (c) 2014-2016 Dmitry V. Levin <ldv@altlinux.org>
+# Copyright (c) 2014-2018 The strace developers.
+# All rights reserved.
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 . "${srcdir=.}/init.sh"
 
+run_prog ../sleep 0
 check_prog grep
-check_prog sleep
 
 grep_log()
 {
        local pattern="$1"; shift
 
-       run_strace "$@"
+       run_strace "$@" ../sleep 1
 
        grep nanosleep "$LOG" > /dev/null ||
                framework_skip_ 'sleep does not use nanosleep'
@@ -23,9 +29,21 @@ grep_log()
        }
 }
 
-grep_log ' *[^ ]+ +0\.0[^n]*nanosleep'         -c sleep 1
-grep_log ' *[^ ]+ +0\.0[^n]*nanosleep'         -c -enanosleep sleep 1
-grep_log ' *[^ ]+ +(1\.0|0\.99)[^n]*nanosleep' -cw sleep 1
-grep_log '100\.00 +(1\.0|0\.99)[^n]*nanosleep' -cw -enanosleep sleep 1
+GENERIC=' *[^ ]+ +0\.0[^n]*nanosleep *'
+WALLCLOCK=' *[^ ]+ +(1\.[01]|0\.99)[^n]*nanosleep *'
+WALLCLOCK1='100\.00 +(1\.[01]|0\.99)[^n]*nanosleep'
+HALFCLOCK=' *[^ ]+ +0\.[567][^n]*nanosleep *'
+
+grep_log "$GENERIC"    -c
+grep_log "$GENERIC"    -c -O1
+grep_log "$GENERIC"    -c -enanosleep
+grep_log "$GENERIC"    -c -O1 -enanosleep
+grep_log "$WALLCLOCK"  -cw
+grep_log "$WALLCLOCK"  -cw -O1
+grep_log "$WALLCLOCK1" -cw -enanosleep
+grep_log "$WALLCLOCK1" -cw -O1 -enanosleep
+grep_log "$HALFCLOCK"  -cw -O4.5e2ms -enanosleep
+grep_log "$HALFCLOCK"  -cw -O4.5e-1s -enanosleep
+grep_log "$HALFCLOCK"  -cw -O456789012ns -enanosleep
 
 exit 0