diff --git a/testsuite/tests-to-run/test61.sh b/testsuite/tests-to-run/test61.sh index f8884780..f29e4d41 100644 --- a/testsuite/tests-to-run/test61.sh +++ b/testsuite/tests-to-run/test61.sh @@ -8,4 +8,17 @@ stdout parallel --return {} -vv -S $SERVER1 echo '>'{} ::: 'aa<${#}" b' rm 'aa<${#}" b' echo '### Test {} multiple times in different commands' -seq 1 10| parallel -v -Xj1 echo {} \; echo {} +seq 10 | parallel -v -Xj1 echo {} \; echo {} + +echo '### Test of -X {1}-{2} with multiple input sources' +parallel -j1 -kX echo {1}-{2} ::: a ::: b +parallel -j2 -kX echo {1}-{2} ::: a b ::: c d +parallel -j2 -kX echo {1}-{2} ::: a b c ::: d e f +parallel -j0 -kX echo {1}-{2} ::: a b c ::: d e f + +echo '### Test of -X {}-{.} with multiple input sources' +parallel -j1 -kX echo {}-{.} ::: a ::: b +parallel -j2 -kX echo {}-{.} ::: a b ::: c d +parallel -j2 -kX echo {}-{.} ::: a b c ::: d e f +parallel -j0 -kX echo {}-{.} ::: a b c ::: d e f + diff --git a/testsuite/wanted-results/test61 b/testsuite/wanted-results/test61 index 81a2ff09..966bd64e 100644 --- a/testsuite/wanted-results/test61 +++ b/testsuite/wanted-results/test61 @@ -4,3 +4,33 @@ ssh parallel-server3 PARALLEL_SEQ=$PARALLEL_SEQ\;export PARALLEL_SEQ\;PARALLEL_P echo 1 2 3 4 5 6 7 8 9 10 ; echo 1 2 3 4 5 6 7 8 9 10 1 2 3 4 5 6 7 8 9 10 1 2 3 4 5 6 7 8 9 10 +### Test of -X {1}-{2} with multiple input sources +a-b +a-c a-d +b-c b-d +a-d a-e a-f b-d b-e +b-f c-d c-e c-f +a-d +a-e +a-f +b-d +b-e +b-f +c-d +c-e +c-f +### Test of -X {}-{.} with multiple input sources +a-a b-b +a-a c-c a-a d-d +b-b c-c b-b d-d +a-a d-d a-a e-e a-a f-f b-b d-d b-b e-e +b-b f-f c-c d-d c-c e-e c-c f-f +a-a d-d +a-a e-e +a-a f-f +b-b d-d +b-b e-e +b-b f-f +c-c d-d +c-c e-e +c-c f-f