From efcfefedf0b0c0d89baa7d97fa408df4832da568 Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Tue, 2 Aug 2016 01:37:42 +0200 Subject: [PATCH] --delay requires full float (0.1 - not .1). --- testsuite/tests-to-run/parallel-local-3s.sh | 4 ++-- testsuite/tests-to-run/parallel-local7.sh | 2 +- testsuite/tests-to-run/parallel-local9.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testsuite/tests-to-run/parallel-local-3s.sh b/testsuite/tests-to-run/parallel-local-3s.sh index 628a4608..041a6cb3 100644 --- a/testsuite/tests-to-run/parallel-local-3s.sh +++ b/testsuite/tests-to-run/parallel-local-3s.sh @@ -56,7 +56,7 @@ echo '### Do children receive --termseq signals' echo '**' echo '### bug #47644: Wrong slot number replacement when resuming' - seq 0 20 | parallel -kj 4 --delay .2 --joblog /tmp/parallel-bug-47558 'sleep 1; echo {%} {=$_==10 and exit =}'; - seq 0 20 | parallel -kj 4 --resume --delay .2 --joblog /tmp/parallel-bug-47558 'sleep 1; echo {%} {=$_==110 and exit =}' + seq 0 20 | parallel -kj 4 --delay 0.2 --joblog /tmp/parallel-bug-47558 'sleep 1; echo {%} {=$_==10 and exit =}'; + seq 0 20 | parallel -kj 4 --resume --delay 0.2 --joblog /tmp/parallel-bug-47558 'sleep 1; echo {%} {=$_==110 and exit =}' EOF diff --git a/testsuite/tests-to-run/parallel-local7.sh b/testsuite/tests-to-run/parallel-local7.sh index 6203f7e7..c83b029a 100755 --- a/testsuite/tests-to-run/parallel-local7.sh +++ b/testsuite/tests-to-run/parallel-local7.sh @@ -7,7 +7,7 @@ par_tmux_filter() { export -f par_tmux_filter par_tmux() { - (stdout parallel --timeout 3 --tmux --delay .03 echo '{}{=$_="\\"x$_=}'; echo $?) | par_tmux_filter + (stdout parallel --timeout 3 --tmux --delay 0.03 echo '{}{=$_="\\"x$_=}'; echo $?) | par_tmux_filter } export -f par_tmux cat <<'EOF' | sed -e 's/;$/; /;s/$SERVER1/'$SERVER1'/;s/$SERVER2/'$SERVER2'/' | stdout parallel -vj3 --timeout 60 --retries 2 -k --joblog /tmp/jl-`basename $0` -L1 diff --git a/testsuite/tests-to-run/parallel-local9.sh b/testsuite/tests-to-run/parallel-local9.sh index a2d8977e..45c70b87 100644 --- a/testsuite/tests-to-run/parallel-local9.sh +++ b/testsuite/tests-to-run/parallel-local9.sh @@ -9,7 +9,7 @@ export NICEPAR cat <<'EOF' | sed -e s/\$SERVER1/$SERVER1/\;s/\$SERVER2/$SERVER2/ | stdout parallel -vj4 -k --joblog /tmp/jl-`basename $0` -L1 echo 'bug #41412: --timeout + --delay causes deadlock'; - seq 10 | parallel -j10 --timeout 1 --delay .3 echo; + seq 10 | parallel -j10 --timeout 1 --delay 0.3 echo; parallel -j3 --timeout 1 --delay 2 echo ::: 1 2 3; parallel -j10 --timeout 2.2 --delay 3 "sleep {}; echo {}" ::: 1 2 7 8 9