From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 6 Dec 2016 08:55:41 +0000 (+0000)
Subject: tests: fix expected output in strace-ttt.test
X-Git-Tag: v4.15~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51694267bd4ace5f5929169c8be588dfd1e425cc;p=strace

tests: fix expected output in strace-ttt.test

If strace -ttt is running too long, it might happen that time stamps
before and after its invocation differ for more than a second.
Adjust expected output to handle this rare but possible case.

* tests/strace-ttt.test: Allow any time stamp between start and finish
of strace invocation.
---

diff --git a/tests/strace-ttt.test b/tests/strace-ttt.test
index 8b0032a2..4439715b 100755
--- a/tests/strace-ttt.test
+++ b/tests/strace-ttt.test
@@ -7,14 +7,20 @@
 run_prog_skip_if_failed date +%s > /dev/null
 run_prog ./sleep 0
 
-t0="$(date +%s)"
+s0="$(date +%s)"
 run_strace -ttt -eexecve $args
-t1="$(date +%s)"
+s1="$(date +%s)"
 
-EXPECTED="$LOG.expected"
-cat > "$EXPECTED" << __EOF__
-($t0|$t1)\\.[[:digit:]]{6} execve\\("\\./sleep", \\["\\./sleep", "0"\\], \\[/\\* [[:digit:]]+ vars \\*/\\]\\) = 0
+s="$s0"
+t_reg=
+while [ "$s" -le "$s1" ]; do
+	[ -z "$t_reg" ] && t_reg="$s" || t_reg="$t_reg|$s"
+	s=$(($s + 1))
+done
+
+cat > "$EXP" << __EOF__
+($t_reg)\\.[[:digit:]]{6} execve\\("\\./sleep", \\["\\./sleep", "0"\\], \\[/\\* [[:digit:]]+ vars \\*/\\]\\) = 0
 __EOF__
 
-match_grep "$LOG" "$EXPECTED"
-rm -f "$EXPECTED"
+match_grep "$LOG" "$EXP"
+rm -f "$EXP"