From 934940b561fbf6d1adff862c6294968fc7e55e8c Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Sat, 10 Oct 2015 03:59:53 +0100 Subject: tests: make a long running test responsive to Ctrl-C * tests/misc/sort-compress-hang.sh: Use --foreground with the timeout(1) command (noting the caveats), to run the sort command in the foreground program group, and thus be responsive to Ctrl-C. This very_expensive_ test takes over a minute on a i3-2310M, with RAM backed /tmp. --- tests/misc/sort-compress-hang.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/misc/sort-compress-hang.sh b/tests/misc/sort-compress-hang.sh index dc101fea8..1d13cbfae 100755 --- a/tests/misc/sort-compress-hang.sh +++ b/tests/misc/sort-compress-hang.sh @@ -35,7 +35,11 @@ tac exp > in || fail=1 # 'sort' could be running slowly on an overburdened machine. # On a circa-2010 Linux server using NFS, a successful test completes # in about 170 seconds, so specify 1700 seconds as a safety margin. -timeout 1700 sort --compress-program=./compress -S 1k in > out || fail=1 +# Note --foreground will not kill any of the "compress" sub processes, +# assuming they're well behaved and exit in a timely manner, but will +# allow this command to be responsive to Ctrl-C +timeout --foreground 1700 sort --compress-program=./compress -S 1k in > out \ + || fail=1 compare exp out || fail=1 test -f ok || fail=1 -- cgit v1.2.3-70-g09d2