summaryrefslogtreecommitdiff
path: root/tests/ls
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2010-02-02 10:47:48 +0000
committerPádraig Brady <P@draigBrady.com>2010-02-02 15:16:40 +0000
commitdd2253f49da057a677199b18b8673cc09bd1f2f5 (patch)
tree2402459625a21d4fc8719d91958144cd51403049 /tests/ls
parentf53a0e1062e251baf709552cdde73ce4f6ccf6fb (diff)
downloadcoreutils-dd2253f49da057a677199b18b8673cc09bd1f2f5.tar.xz
tests: fix various timeout races
Prompted by the continuous integration build failure at: http://hydra.nixos.org/build/277485 * tests/misc/timeout: Set all expected timeouts to 1s and all unexpected timeouts to 10s. In this way, tests normally proceed quickly but may delay up to 10s before reporting failures. * tests/ls/infloop: Likewise. * tests/tail-2/pid: Likewise. * tests/tail-2/pipe-f: Likewise. * tests/tail-2/wait: Likewise. * tests/dd/skip-seek-past-dev: Likewise.
Diffstat (limited to 'tests/ls')
-rwxr-xr-xtests/ls/infloop2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ls/infloop b/tests/ls/infloop
index 2ab486db1..b237adc39 100755
--- a/tests/ls/infloop
+++ b/tests/ls/infloop
@@ -36,7 +36,7 @@ cat <<\EOF > exp-err || framework_failure
ls: loop/sub: not listing already-listed directory
EOF
-timeout 1 ls -RL loop >out 2>err
+timeout 10 ls -RL loop >out 2>err
# Ensure that ls exits with status 2 upon detecting a cycle
test $? = 2 || fail=1