diff --git a/testsuite/tests-to-run/parallel-local-ssh2.sh b/testsuite/tests-to-run/parallel-local-ssh2.sh index ed54f919..c3379c7d 100644 --- a/testsuite/tests-to-run/parallel-local-ssh2.sh +++ b/testsuite/tests-to-run/parallel-local-ssh2.sh @@ -30,4 +30,10 @@ echo '2bug #43358: shellshock breaks exporting functions using --env' export -f funky; parallel --env funky -S centos3.tange.dk funky ::: non-shellshock-hardened +echo '### bug #42999: --pipepart with remote does not work' + seq 100 > /tmp/bug42999; chmod 600 /tmp/bug42999; + parallel --sshdelay 0.3 --pipepart --block 31 -a /tmp/bug42999 -k -S parallel@lo wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; + parallel --sshdelay 0.2 --pipepart --block 31 -a /tmp/bug42999 -k --fifo -S parallel@lo wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; + parallel --sshdelay 0.1 --pipepart --block 31 -a /tmp/bug42999 -k --cat -S parallel@lo wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; + EOF diff --git a/testsuite/tests-to-run/parallel-local22.sh b/testsuite/tests-to-run/parallel-local22.sh index e07064f1..5dd1f71d 100755 --- a/testsuite/tests-to-run/parallel-local22.sh +++ b/testsuite/tests-to-run/parallel-local22.sh @@ -49,12 +49,6 @@ echo '### bug #42363: --pipepart and --fifo/--cat does not work' parallel --pipepart --block 31 -a /tmp/bug42363 -k --fifo wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; parallel --pipepart --block 31 -a /tmp/bug42363 -k --cat wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; -echo '### bug #42999: --pipepart with remote does not work' - seq 100 > /tmp/bug42999; chmod 600 /tmp/bug42999; - parallel --pipepart --block 31 -a /tmp/bug42999 -k -S parallel@lo wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; - parallel --pipepart --block 31 -a /tmp/bug42999 -k --fifo -S parallel@lo wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; - parallel --pipepart --block 31 -a /tmp/bug42999 -k --cat -S parallel@lo wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; - echo '### bug #42055: --pipepart -a bigfile should not require sequential reading of bigfile' parallel --pipepart -a /etc/passwd -L 1 should not be run parallel --pipepart -a /etc/passwd -N 1 should not be run diff --git a/testsuite/wanted-results/parallel-local-ssh2 b/testsuite/wanted-results/parallel-local-ssh2 index cca01bb7..e68a6727 100644 --- a/testsuite/wanted-results/parallel-local-ssh2 +++ b/testsuite/wanted-results/parallel-local-ssh2 @@ -40,3 +40,33 @@ echo '2bug #43358: shellshock breaks exporting functions using --env' echo shellshock-hardened to non-shellshock-hardened; funky() { echo Function $1; }; export -f funky; parallel --env funky -S centos3.tange.dk funky ::: non-shellshock-hardened shellshock-hardened to non-shellshock-hardened Function non-shellshock-hardened +echo '### bug #42999: --pipepart with remote does not work' +### bug #42999: --pipepart with remote does not work + seq 100 > /tmp/bug42999; chmod 600 /tmp/bug42999; parallel --sshdelay 0.3 --pipepart --block 31 -a /tmp/bug42999 -k -S parallel@lo wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; parallel --sshdelay 0.2 --pipepart --block 31 -a /tmp/bug42999 -k --fifo -S parallel@lo wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; parallel --sshdelay 0.1 --pipepart --block 31 -a /tmp/bug42999 -k --cat -S parallel@lo wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; + 13 14 32 + 11 11 33 + 11 11 33 + 11 11 33 + 11 11 33 + 11 11 33 + 11 11 33 + 11 11 33 + 10 9 29 + 13 14 32 /tmp/XXXX + 11 11 33 /tmp/XXXX + 11 11 33 /tmp/XXXX + 11 11 33 /tmp/XXXX + 11 11 33 /tmp/XXXX + 11 11 33 /tmp/XXXX + 11 11 33 /tmp/XXXX + 11 11 33 /tmp/XXXX + 10 9 29 /tmp/XXXX +13 14 32 /tmp/XXXX +11 11 33 /tmp/XXXX +11 11 33 /tmp/XXXX +11 11 33 /tmp/XXXX +11 11 33 /tmp/XXXX +11 11 33 /tmp/XXXX +11 11 33 /tmp/XXXX +11 11 33 /tmp/XXXX +10 9 29 /tmp/XXXX diff --git a/testsuite/wanted-results/parallel-local22 b/testsuite/wanted-results/parallel-local22 index 77570b93..d9fe3fd6 100644 --- a/testsuite/wanted-results/parallel-local22 +++ b/testsuite/wanted-results/parallel-local22 @@ -43,36 +43,7 @@ echo '### bug #42041: Implement $PARALLEL_JOBSLOT' 2 echo '### bug #42363: --pipepart and --fifo/--cat does not work' ### bug #42363: --pipepart and --fifo/--cat does not work - seq 100 > /tmp/bug42363; parallel --pipepart --block 31 -a /tmp/bug42363 -k --fifo wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; parallel --pipepart --block 31 -a /tmp/bug42363 -k --cat wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; echo '### bug #42999: --pipepart with remote does not work' - 13 14 32 /tmp/XXXX - 11 11 33 /tmp/XXXX - 11 11 33 /tmp/XXXX - 11 11 33 /tmp/XXXX - 11 11 33 /tmp/XXXX - 11 11 33 /tmp/XXXX - 11 11 33 /tmp/XXXX - 11 11 33 /tmp/XXXX - 10 9 29 /tmp/XXXX -13 14 32 /tmp/XXXX -11 11 33 /tmp/XXXX -11 11 33 /tmp/XXXX -11 11 33 /tmp/XXXX -11 11 33 /tmp/XXXX -11 11 33 /tmp/XXXX -11 11 33 /tmp/XXXX -11 11 33 /tmp/XXXX -10 9 29 /tmp/XXXX -### bug #42999: --pipepart with remote does not work - seq 100 > /tmp/bug42999; chmod 600 /tmp/bug42999; parallel --pipepart --block 31 -a /tmp/bug42999 -k -S parallel@lo wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; parallel --pipepart --block 31 -a /tmp/bug42999 -k --fifo -S parallel@lo wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; parallel --pipepart --block 31 -a /tmp/bug42999 -k --cat -S parallel@lo wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; echo '### bug #42055: --pipepart -a bigfile should not require sequential reading of bigfile' - 13 14 32 - 11 11 33 - 11 11 33 - 11 11 33 - 11 11 33 - 11 11 33 - 11 11 33 - 11 11 33 - 10 9 29 + seq 100 > /tmp/bug42363; parallel --pipepart --block 31 -a /tmp/bug42363 -k --fifo wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; parallel --pipepart --block 31 -a /tmp/bug42363 -k --cat wc | perl -pe s:/tmp/.........pip:/tmp/XXXX: ; echo '### bug #42055: --pipepart -a bigfile should not require sequential reading of bigfile' 13 14 32 /tmp/XXXX 11 11 33 /tmp/XXXX 11 11 33 /tmp/XXXX