testsuite: Renamed files that can run without network.

testsuite/Makefile

@@ -13,7 +13,7 @@ testsuite: ../src/parallel tests-to-run/* wanted-results/* startdb
 	niceload true || (echo niceload is required for testsuite; /bin/false)
 	which burnP6 || (echo burnP6 is required for testsuite; /bin/false)
 	which timeout || (echo timeout is required for testsuite; /bin/false)
-	parallel ssh parallel@parallel-server{} parallel --minversion 20100101 ::: 1 2 3 || (echo parallel on remote required for testsuite; /bin/false)
+	parallel ssh parallel@parallel-server{} parallel --minversion 20100101 ::: 1 2 3 || (echo parallel on remote required for testsuite; /bin/true)
 	time sh Start.sh
 	date
 

testsuite/tests-to-run/parallel-local1.sh

@@ -1,9 +1,6 @@
 #!/bin/bash
 
-SERVER1=parallel-server3
-SERVER2=parallel-server2
-
-cat <<'EOF' | sed -e s/\$SERVER1/$SERVER1/\;s/\$SERVER2/$SERVER2/ | parallel -j0 -k
+cat <<'EOF' | parallel -j0 -k
 echo "### Test --basenamereplace"
 parallel -j1 -k -X --basenamereplace FOO echo FOO ::: /a/b.c a/b.c b.c /a/b a/b b
 parallel -k --basenamereplace FOO echo FOO ::: /a/b.c a/b.c b.c /a/b a/b b
@@ -42,16 +39,7 @@ parallel -j1 -k -X echo {2/} ::: /a/number1.c a/number2.c number3.c /a/number4 a
 
 echo "### Test {#.}"
 parallel -j1 -k -X echo {2.} ::: /a/number1.c a/number2.c number3.c /a/number4 a/number5 number6
+
+echo "### bug #34241: --pipe should not spawn unneeded processes"
+echo | parallel -r -j2 -N1 --pipe md5sum -c && echo OK
 EOF
-
-rm -rf tmp
-
-echo "### Test combined -X --return {/}_{/.}_{#/.}_{#/}_{#.} with files containing space"
-stdout parallel -j1 -k -Xv --cleanup --return tmp/{/}_{/.}_{2/.}_{2/}_{2.}/file -S parallel@$SERVER2 \
-mkdir -p tmp/{/}_{/.}_{2/.}_{2/}_{2.} \;touch tmp/{/}_{/.}_{2/.}_{2/}_{2.}/file \
-::: /a/number1.c a/number2.c number3.c /a/number4 a/number5 number6 'number 7' 'number <8|8>'
-find tmp
-rm -rf tmp
-
-echo "### Here we ought to test -m --return {/}_{/.}_{#/.}_{#/}_{#.} with files containing space"
-echo "### But we will wait for a real world scenario"

testsuite/tests-to-run/parallel-local2.sh

@@ -2,7 +2,6 @@
 
 echo '### Test slow arguments generation - https://savannah.gnu.org/bugs/?32834'
 seq 1 3 | parallel -j1 "sleep 2; echo {}" | parallel -kj2 echo
-#seq 1000000000 1000000010 | pv -L 10 -q | stdout parallel -j 10 echo
 
 echo '### Test too slow spawning'
 killall -9 burnP6 2>/dev/null

testsuite/tests-to-run/parallel-local4.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cat <<'EOF' | sed -e s/\$SERVER1/$SERVER1/\;s/\$SERVER2/$SERVER2/ | parallel -j0 -vk
+cat <<'EOF' | parallel -j0 -vk
 echo '### Test if we can deal with output > 4 GB'
 echo | niceload --io 9 -H parallel -q perl -e '"\$a=\"x\"x1000000;for(0..4300){print \$a}"' | md5sum
 

testsuite/tests-to-run/test23.sh

@@ -30,3 +30,13 @@ ls parallel_*.test | parallel -j+0 --trc {.}.out --bf my_script \
 -S $SSHLOGIN1,$SSHLOGIN2,: "./my_script {} > {.}.out"
 cat parallel_*.test parallel_*.out
 
+rm -rf tmp
+echo "### Test combined -X --return {/}_{/.}_{#/.}_{#/}_{#.} with files containing space"
+stdout parallel -j1 -k -Xv --cleanup --return tmp/{/}_{/.}_{2/.}_{2/}_{2.}/file -S $SSHLOGIN2 \
+mkdir -p tmp/{/}_{/.}_{2/.}_{2/}_{2.} \;touch tmp/{/}_{/.}_{2/.}_{2/}_{2.}/file \
+::: /a/number1.c a/number2.c number3.c /a/number4 a/number5 number6 'number 7' 'number <8|8>'
+find tmp
+rm -rf tmp
+
+echo "### Here we ought to test -m --return {/}_{/.}_{#/.}_{#/}_{#.} with files containing space"
+echo "### But we will wait for a real world scenario"

testsuite/wanted-results/parallel-local1

@@ -0,0 +1,59 @@
+### Test --basenamereplace
+b.c b.c b.c b b b
+b.c
+b.c
+b.c
+b
+b
+b
+### Test --bnr
+b.c b.c b.c b b b
+b.c
+b.c
+b.c
+b
+b
+b
+### Test --extensionreplace
+/a/b a/b b /a/b a/b b
+/a/b
+a/b
+b
+/a/b
+a/b
+b
+### Test --er
+/a/b a/b b /a/b a/b b
+/a/b
+a/b
+b
+/a/b
+a/b
+b
+### Test --basenameextensionreplace
+b b b b b b
+b
+b
+b
+b
+b
+b
+### Test --bner
+b b b b b b
+b
+b
+b
+b
+b
+b
+### Test {/}
+b.c b.c b.c b b b
+### Test {/.}
+b b b b b b
+### Test {#/.}
+number2
+### Test {#/}
+number2.c
+### Test {#.}
+a/number2
+### bug #34241: --pipe should not spawn unneeded processes

testsuite/wanted-results/test23

@@ -44,3 +44,33 @@ OK
 7
 8
 9
+### Test combined -X --return {/}_{/.}_{#/.}_{#/}_{#.} with files containing space
+parallel: Warning: using -X or -m with --sshlogin may fail
+mkdir -p tmp/number1.c_number1_number2_number2.c_a/number2 tmp/number2.c_number2_number2_number2.c_a/number2 tmp/number3.c_number3_number2_number2.c_a/number2 tmp/number4_number4_number2_number2.c_a/number2 tmp/number5_number5_number2_number2.c_a/number2 tmp/number6_number6_number2_number2.c_a/number2 tmp/number\ 7_number\ 7_number2_number2.c_a/number2 tmp/number\ \<8\|8\>_number\ \<8\|8\>_number2_number2.c_a/number2 ;touch tmp/number1.c_number1_number2_number2.c_a/number2/file tmp/number2.c_number2_number2_number2.c_a/number2/file tmp/number3.c_number3_number2_number2.c_a/number2/file tmp/number4_number4_number2_number2.c_a/number2/file tmp/number5_number5_number2_number2.c_a/number2/file tmp/number6_number6_number2_number2.c_a/number2/file tmp/number\ 7_number\ 7_number2_number2.c_a/number2/file tmp/number\ \<8\|8\>_number\ \<8\|8\>_number2_number2.c_a/number2/file
+tmp
+tmp/number6_number6_number2_number2.c_a
+tmp/number6_number6_number2_number2.c_a/number2
+tmp/number6_number6_number2_number2.c_a/number2/file
+tmp/number5_number5_number2_number2.c_a
+tmp/number5_number5_number2_number2.c_a/number2
+tmp/number5_number5_number2_number2.c_a/number2/file
+tmp/number4_number4_number2_number2.c_a
+tmp/number4_number4_number2_number2.c_a/number2
+tmp/number4_number4_number2_number2.c_a/number2/file
+tmp/number3.c_number3_number2_number2.c_a
+tmp/number3.c_number3_number2_number2.c_a/number2
+tmp/number3.c_number3_number2_number2.c_a/number2/file
+tmp/number2.c_number2_number2_number2.c_a
+tmp/number2.c_number2_number2_number2.c_a/number2
+tmp/number2.c_number2_number2_number2.c_a/number2/file
+tmp/number1.c_number1_number2_number2.c_a
+tmp/number1.c_number1_number2_number2.c_a/number2
+tmp/number1.c_number1_number2_number2.c_a/number2/file
+tmp/number <8|8>_number <8|8>_number2_number2.c_a
+tmp/number <8|8>_number <8|8>_number2_number2.c_a/number2
+tmp/number <8|8>_number <8|8>_number2_number2.c_a/number2/file
+tmp/number 7_number 7_number2_number2.c_a
+tmp/number 7_number 7_number2_number2.c_a/number2
+tmp/number 7_number 7_number2_number2.c_a/number2/file
+### Here we ought to test -m --return {/}_{/.}_{#/.}_{#/}_{#.} with files containing space
+### But we will wait for a real world scenario

testsuite/wanted-results/test42

@@ -1,88 +0,0 @@
-### Test --basenamereplace
-b.c b.c b.c b b b
-b.c
-b.c
-b.c
-b
-b
-b
-### Test --bnr
-b.c b.c b.c b b b
-b.c
-b.c
-b.c
-b
-b
-b
-### Test --extensionreplace
-/a/b a/b b /a/b a/b b
-/a/b
-a/b
-b
-/a/b
-a/b
-b
-### Test --er
-/a/b a/b b /a/b a/b b
-/a/b
-a/b
-b
-/a/b
-a/b
-b
-### Test --basenameextensionreplace
-b b b b b b
-b
-b
-b
-b
-b
-b
-### Test --bner
-b b b b b b
-b
-b
-b
-b
-b
-b
-### Test {/}
-b.c b.c b.c b b b
-### Test {/.}
-b b b b b b
-### Test {#/.}
-number2
-### Test {#/}
-number2.c
-### Test {#.}
-a/number2
-### Test combined -X --return {/}_{/.}_{#/.}_{#/}_{#.} with files containing space
-parallel: Warning: using -X or -m with --sshlogin may fail
-mkdir -p tmp/number1.c_number1_number2_number2.c_a/number2 tmp/number2.c_number2_number2_number2.c_a/number2 tmp/number3.c_number3_number2_number2.c_a/number2 tmp/number4_number4_number2_number2.c_a/number2 tmp/number5_number5_number2_number2.c_a/number2 tmp/number6_number6_number2_number2.c_a/number2 tmp/number\ 7_number\ 7_number2_number2.c_a/number2 tmp/number\ \<8\|8\>_number\ \<8\|8\>_number2_number2.c_a/number2 ;touch tmp/number1.c_number1_number2_number2.c_a/number2/file tmp/number2.c_number2_number2_number2.c_a/number2/file tmp/number3.c_number3_number2_number2.c_a/number2/file tmp/number4_number4_number2_number2.c_a/number2/file tmp/number5_number5_number2_number2.c_a/number2/file tmp/number6_number6_number2_number2.c_a/number2/file tmp/number\ 7_number\ 7_number2_number2.c_a/number2/file tmp/number\ \<8\|8\>_number\ \<8\|8\>_number2_number2.c_a/number2/file
-tmp
-tmp/number6_number6_number2_number2.c_a
-tmp/number6_number6_number2_number2.c_a/number2
-tmp/number6_number6_number2_number2.c_a/number2/file
-tmp/number <8|8>_number <8|8>_number2_number2.c_a
-tmp/number <8|8>_number <8|8>_number2_number2.c_a/number2
-tmp/number <8|8>_number <8|8>_number2_number2.c_a/number2/file
-tmp/number3.c_number3_number2_number2.c_a
-tmp/number3.c_number3_number2_number2.c_a/number2
-tmp/number3.c_number3_number2_number2.c_a/number2/file
-tmp/number5_number5_number2_number2.c_a
-tmp/number5_number5_number2_number2.c_a/number2
-tmp/number5_number5_number2_number2.c_a/number2/file
-tmp/number2.c_number2_number2_number2.c_a
-tmp/number2.c_number2_number2_number2.c_a/number2
-tmp/number2.c_number2_number2_number2.c_a/number2/file
-tmp/number1.c_number1_number2_number2.c_a
-tmp/number1.c_number1_number2_number2.c_a/number2
-tmp/number1.c_number1_number2_number2.c_a/number2/file
-tmp/number4_number4_number2_number2.c_a
-tmp/number4_number4_number2_number2.c_a/number2
-tmp/number4_number4_number2_number2.c_a/number2/file
-tmp/number 7_number 7_number2_number2.c_a
-tmp/number 7_number 7_number2_number2.c_a/number2
-tmp/number 7_number 7_number2_number2.c_a/number2/file
-### Here we ought to test -m --return {/}_{/.}_{#/.}_{#/}_{#.} with files containing space
-### But we will wait for a real world scenario