diff --git a/testsuite/tests-to-run/parallel-local-ssh1.sh b/testsuite/tests-to-run/parallel-local-ssh1.sh index 17f22526..ff10f58d 100644 --- a/testsuite/tests-to-run/parallel-local-ssh1.sh +++ b/testsuite/tests-to-run/parallel-local-ssh1.sh @@ -2,5 +2,5 @@ cat <<'EOF' | sed -e s/\$SERVER1/$SERVER1/\;s/\$SERVER2/$SERVER2/ | parallel -j10 -k -L1 echo '### Test bug #34241: --pipe should not spawn unneeded processes' - seq 5 | ssh csh@lo parallel --block 5 --pipe -j10 cat\\\;echo Block_end + seq 5 | ssh csh@lo parallel -k --block 5 --pipe -j10 cat\\\;echo Block_end EOF diff --git a/testsuite/tests-to-run/parallel-local164.sh b/testsuite/tests-to-run/parallel-local164.sh index 122de80b..c2e01d5d 100644 --- a/testsuite/tests-to-run/parallel-local164.sh +++ b/testsuite/tests-to-run/parallel-local164.sh @@ -112,4 +112,6 @@ echo '### -k -i -0' echo '### -k -0 -i repl' printf '1\0002\0003\0004\0005\000' | stdout parallel -k -0 -i repl echo repl OK +echo '### test --sshdelay' + stdout /usr/bin/time -f %e parallel -j0 --sshdelay 0.5 -S localhost true ::: 1 2 3 | perl -ne 'print($_ > 1.80 ? "OK\n" : "Not OK\n")' EOF diff --git a/testsuite/wanted-results/parallel-local-ssh1 b/testsuite/wanted-results/parallel-local-ssh1 new file mode 100644 index 00000000..5f636246 --- /dev/null +++ b/testsuite/wanted-results/parallel-local-ssh1 @@ -0,0 +1,8 @@ +### Test bug #34241: --pipe should not spawn unneeded processes +1 +2 +Block_end +3 +4 +5 +Block_end diff --git a/testsuite/wanted-results/parallel-local1 b/testsuite/wanted-results/parallel-local1 index 367c186c..cbc59645 100644 --- a/testsuite/wanted-results/parallel-local1 +++ b/testsuite/wanted-results/parallel-local1 @@ -57,6 +57,7 @@ number2.c ### Test {#.} a/number2 ### bug #34241: --pipe should not spawn unneeded processes +OK ### Test of quoting of > bug >/dev/null ### Test of quoting of > bug if line continuation diff --git a/testsuite/wanted-results/parallel-local164 b/testsuite/wanted-results/parallel-local164 index eff31ccb..3ab39dbd 100644 --- a/testsuite/wanted-results/parallel-local164 +++ b/testsuite/wanted-results/parallel-local164 @@ -197,3 +197,5 @@ OK 3 OK 4 OK 5 OK +### test --sshdelay +OK diff --git a/testsuite/wanted-results/sql01 b/testsuite/wanted-results/sql01 index 36428ee4..29fa1b22 100644 --- a/testsuite/wanted-results/sql01 +++ b/testsuite/wanted-results/sql01 @@ -42,8 +42,8 @@ def 3 2 6 54 2 6 54 ### Test --table-size --tablesize -39 -39 +42 +42 ### Test --debug dburl mysql://sqlunittest:CB5A1FFFA5A@localhost:3306/sqlunittest databasedriver mysql user sqlunittest password CB5A1FFFA5A host localhost port 3306 database sqlunittest query diff --git a/testsuite/wanted-results/test13 b/testsuite/wanted-results/test13 index c18ee2e5..2ae8b3db 100644 --- a/testsuite/wanted-results/test13 +++ b/testsuite/wanted-results/test13 @@ -1,5 +1,5 @@ ### Test -k -parallel: Warning: Only enough filehandles to run 20 jobs in parallel. Raising ulimit -n may help. +parallel: Warning: Only enough filehandles to run 19 jobs in parallel. Raising ulimit -n may help. begin 1 2