[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] tests: fix possible 8 minute running time of inotify-rotate.sh
From: |
Pádraig Brady |
Subject: |
[PATCH] tests: fix possible 8 minute running time of inotify-rotate.sh |
Date: |
Tue, 30 Dec 2014 02:24:40 +0000 |
Commit v8.23-63-g111a2b9 removed the expensive tag on this test,
as it runs quickly on systems with inotify. However without that
it would take about 8 minutes for the test to complete all iterations.
* tests/tail-2/inotify-rotate.sh: Tag as expensive without inotify.
Also adjust the polling parameters used on systems without inotify
so that the test completes within about 15 seconds.
---
tests/tail-2/inotify-rotate.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/tail-2/inotify-rotate.sh b/tests/tail-2/inotify-rotate.sh
index 6b539a6..58b7e03 100755
--- a/tests/tail-2/inotify-rotate.sh
+++ b/tests/tail-2/inotify-rotate.sh
@@ -23,6 +23,9 @@ fi
. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+grep '^#define HAVE_INOTIFY 1' "$CONFIG_HEADER" >/dev/null \
+ || expensive_
+
check_tail_output()
{
local delay="$1"
@@ -53,7 +56,7 @@ for i in $(seq 50); do
# and a lot of disk activity, even 20 seconds is insufficient, which
# leads to this timeout killing tail before the "ok" is written below.
>k && >x || framework_failure_ failed to initialize files
- timeout 60 tail -F k > out 2>&1 &
+ timeout 60 tail -s.1 --max-unchanged-stats=1 -F k > out 2>&1 &
pid=$!
echo b > k;
--
2.1.0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] tests: fix possible 8 minute running time of inotify-rotate.sh,
Pádraig Brady <=