From: Dmitry V. Levin <ldv@altlinux.org>
Date: Mon, 18 Feb 2019 00:29:43 +0000 (+0000)
Subject: tests: robustify threads-execve test against the odds
X-Git-Tag: v5.0~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a50278b97b081d85a161b7d50059368fa7ef0b8;p=strace

tests: robustify threads-execve test against the odds

Give threads-execve.test more chances to succeed.

* tests/threads-execve.test: Retry the test until run out of time.
---

diff --git a/tests/threads-execve.test b/tests/threads-execve.test
index 30612a3c..2c8c3632 100755
--- a/tests/threads-execve.test
+++ b/tests/threads-execve.test
@@ -15,18 +15,20 @@
 require_min_kernel_version_or_skip 3.1
 
 check_prog diff
+run_prog_skip_if_failed date +%s > /dev/null
+s0="$(date +%s)"
+
 run_prog > /dev/null
 
 set -- -a21 -f -esignal=none -e trace=execve,exit,nanosleep,rt_sigsuspend $args
 
 # Due to probabilistic nature of the test, try it several times.
-i=0
-while [ $i -le 19 ]; do
-	i="$(($i+1))"
+while :; do
 	run_strace "$@" > "$EXP"
 	sed 1d < "$LOG" > "$OUT"
-	diff -- "$EXP" "$OUT" || continue
-	exit 0
+	diff -- "$EXP" "$OUT" && exit 0
+	s1="$(date +%s)"
+	if [ "$(($s1-$s0))" -gt "$(($TIMEOUT_DURATION/2))" ]; then
+		fail_ "$STRACE $* output mismatch"
+	fi
 done
-
-fail_ "$STRACE $* output mismatch"