From 129ebd4fab792f96b9769f530efce8b5b4a0b555 Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Sun, 6 May 2012 00:02:08 +0200 Subject: [PATCH] testsuite: Renamed files that can run without network. --- testsuite/Makefile | 2 +- .../{test42.sh => parallel-local1.sh} | 20 +--- .../{test38.sh => parallel-local10.sh} | 0 .../{test03.sh => parallel-local103.sh} | 0 .../{test04.sh => parallel-local104.sh} | 0 .../{test05.sh => parallel-local105.sh} | 0 .../{test06.sh => parallel-local106.sh} | 0 .../{test07.sh => parallel-local107.sh} | 0 .../{test08.sh => parallel-local108.sh} | 0 .../{test09.sh => parallel-local11.sh} | 0 .../{test11.sh => parallel-local111.sh} | 0 .../{test14.sh => parallel-local114.sh} | 0 .../{test25.sh => parallel-local12.sh} | 0 .../{test20.sh => parallel-local120.sh} | 0 .../{test22.sh => parallel-local122.sh} | 0 .../{test29.sh => parallel-local129.sh} | 0 .../{test27.sh => parallel-local13.sh} | 0 .../{test39.sh => parallel-local139.sh} | 0 .../{test43.sh => parallel-local14.sh} | 0 .../{test40.sh => parallel-local140.sh} | 0 .../{test44.sh => parallel-local144.sh} | 0 .../{test48.sh => parallel-local148.sh} | 0 .../{test01.sh => parallel-local15.sh} | 0 .../{test50.sh => parallel-local150.sh} | 0 .../{test52.sh => parallel-local152.sh} | 0 .../{test53.sh => parallel-local153.sh} | 0 .../{test54.sh => parallel-local154.sh} | 0 .../{test24.sh => parallel-local155.sh} | 0 .../{test56.sh => parallel-local156.sh} | 0 .../{test57.sh => parallel-local157.sh} | 0 .../{test26.sh => parallel-local16.sh} | 0 .../{test63.sh => parallel-local163.sh} | 0 .../{test64.sh => parallel-local164.sh} | 0 .../{test55.sh => parallel-local17.sh} | 0 .../{test28.sh => parallel-local18.sh} | 0 .../{test16.sh => parallel-local19.sh} | 0 .../{test34.sh => parallel-local2.sh} | 1 - .../{test31.sh => parallel-local20.sh} | 0 .../{test59.sh => parallel-local21.sh} | 0 .../{test10.sh => parallel-local22.sh} | 0 .../{test02.sh => parallel-local23.sh} | 0 .../{test33.sh => parallel-local3.sh} | 0 .../{test12.sh => parallel-local4.sh} | 2 +- .../{test51.sh => parallel-local5.sh} | 0 .../{test62.sh => parallel-local6.sh} | 0 .../{test58.sh => parallel-local7.sh} | 0 .../{test66.sh => parallel-local8.sh} | 0 .../{test49.sh => parallel-local9.sh} | 0 testsuite/tests-to-run/test23.sh | 10 ++ testsuite/wanted-results/parallel-local1 | 59 ++++++++++++ .../{test38 => parallel-local10} | 0 .../{test03 => parallel-local103} | 0 .../{test04 => parallel-local104} | Bin .../{test05 => parallel-local105} | 0 .../{test06 => parallel-local106} | 0 .../{test07 => parallel-local107} | 0 .../{test08 => parallel-local108} | 0 .../{test09 => parallel-local11} | 0 .../{test11 => parallel-local111} | 0 .../{test14 => parallel-local114} | 0 .../{test25 => parallel-local12} | 0 .../{test20 => parallel-local120} | 0 .../{test22 => parallel-local122} | 0 .../{test29 => parallel-local129} | 0 .../{test27 => parallel-local13} | 0 .../{test39 => parallel-local139} | 0 .../{test43 => parallel-local14} | 0 .../{test40 => parallel-local140} | 0 .../{test24 => parallel-local144} | 0 .../{test28 => parallel-local148} | 0 .../{test01 => parallel-local15} | 0 .../{test50 => parallel-local150} | 0 .../{test52 => parallel-local152} | 0 .../{test44 => parallel-local153} | 0 .../{test54 => parallel-local154} | 0 .../{test48 => parallel-local155} | 0 .../{test53 => parallel-local156} | 0 .../{test57 => parallel-local157} | 0 .../{test26 => parallel-local16} | 0 .../{test55 => parallel-local163} | 0 .../{test64 => parallel-local164} | 0 .../{test56 => parallel-local17} | 0 .../{test63 => parallel-local18} | 0 .../{test16 => parallel-local19} | 0 .../{test34 => parallel-local2} | 0 .../{test31 => parallel-local20} | 0 .../{test59 => parallel-local21} | 0 .../{test10 => parallel-local22} | 0 .../{test02 => parallel-local23} | 0 .../{test33 => parallel-local3} | 0 .../{test12 => parallel-local4} | 0 .../{test51 => parallel-local5} | 0 .../{test62 => parallel-local6} | 0 .../{test58 => parallel-local7} | 0 .../{test66 => parallel-local8} | 0 .../{test49 => parallel-local9} | 0 testsuite/wanted-results/test23 | 30 ++++++ testsuite/wanted-results/test42 | 88 ------------------ 98 files changed, 105 insertions(+), 107 deletions(-) rename testsuite/tests-to-run/{test42.sh => parallel-local1.sh} (70%) rename testsuite/tests-to-run/{test38.sh => parallel-local10.sh} (100%) rename testsuite/tests-to-run/{test03.sh => parallel-local103.sh} (100%) rename testsuite/tests-to-run/{test04.sh => parallel-local104.sh} (100%) rename testsuite/tests-to-run/{test05.sh => parallel-local105.sh} (100%) rename testsuite/tests-to-run/{test06.sh => parallel-local106.sh} (100%) rename testsuite/tests-to-run/{test07.sh => parallel-local107.sh} (100%) rename testsuite/tests-to-run/{test08.sh => parallel-local108.sh} (100%) rename testsuite/tests-to-run/{test09.sh => parallel-local11.sh} (100%) rename testsuite/tests-to-run/{test11.sh => parallel-local111.sh} (100%) rename testsuite/tests-to-run/{test14.sh => parallel-local114.sh} (100%) rename testsuite/tests-to-run/{test25.sh => parallel-local12.sh} (100%) rename testsuite/tests-to-run/{test20.sh => parallel-local120.sh} (100%) rename testsuite/tests-to-run/{test22.sh => parallel-local122.sh} (100%) rename testsuite/tests-to-run/{test29.sh => parallel-local129.sh} (100%) rename testsuite/tests-to-run/{test27.sh => parallel-local13.sh} (100%) rename testsuite/tests-to-run/{test39.sh => parallel-local139.sh} (100%) rename testsuite/tests-to-run/{test43.sh => parallel-local14.sh} (100%) rename testsuite/tests-to-run/{test40.sh => parallel-local140.sh} (100%) rename testsuite/tests-to-run/{test44.sh => parallel-local144.sh} (100%) rename testsuite/tests-to-run/{test48.sh => parallel-local148.sh} (100%) rename testsuite/tests-to-run/{test01.sh => parallel-local15.sh} (100%) rename testsuite/tests-to-run/{test50.sh => parallel-local150.sh} (100%) rename testsuite/tests-to-run/{test52.sh => parallel-local152.sh} (100%) rename testsuite/tests-to-run/{test53.sh => parallel-local153.sh} (100%) rename testsuite/tests-to-run/{test54.sh => parallel-local154.sh} (100%) rename testsuite/tests-to-run/{test24.sh => parallel-local155.sh} (100%) mode change 100755 => 100644 rename testsuite/tests-to-run/{test56.sh => parallel-local156.sh} (100%) rename testsuite/tests-to-run/{test57.sh => parallel-local157.sh} (100%) rename testsuite/tests-to-run/{test26.sh => parallel-local16.sh} (100%) rename testsuite/tests-to-run/{test63.sh => parallel-local163.sh} (100%) rename testsuite/tests-to-run/{test64.sh => parallel-local164.sh} (100%) rename testsuite/tests-to-run/{test55.sh => parallel-local17.sh} (100%) mode change 100644 => 100755 rename testsuite/tests-to-run/{test28.sh => parallel-local18.sh} (100%) rename testsuite/tests-to-run/{test16.sh => parallel-local19.sh} (100%) rename testsuite/tests-to-run/{test34.sh => parallel-local2.sh} (87%) rename testsuite/tests-to-run/{test31.sh => parallel-local20.sh} (100%) rename testsuite/tests-to-run/{test59.sh => parallel-local21.sh} (100%) rename testsuite/tests-to-run/{test10.sh => parallel-local22.sh} (100%) rename testsuite/tests-to-run/{test02.sh => parallel-local23.sh} (100%) rename testsuite/tests-to-run/{test33.sh => parallel-local3.sh} (100%) rename testsuite/tests-to-run/{test12.sh => parallel-local4.sh} (84%) mode change 100755 => 100644 rename testsuite/tests-to-run/{test51.sh => parallel-local5.sh} (100%) rename testsuite/tests-to-run/{test62.sh => parallel-local6.sh} (100%) rename testsuite/tests-to-run/{test58.sh => parallel-local7.sh} (100%) rename testsuite/tests-to-run/{test66.sh => parallel-local8.sh} (100%) rename testsuite/tests-to-run/{test49.sh => parallel-local9.sh} (100%) create mode 100644 testsuite/wanted-results/parallel-local1 rename testsuite/wanted-results/{test38 => parallel-local10} (100%) rename testsuite/wanted-results/{test03 => parallel-local103} (100%) rename testsuite/wanted-results/{test04 => parallel-local104} (100%) rename testsuite/wanted-results/{test05 => parallel-local105} (100%) rename testsuite/wanted-results/{test06 => parallel-local106} (100%) rename testsuite/wanted-results/{test07 => parallel-local107} (100%) rename testsuite/wanted-results/{test08 => parallel-local108} (100%) rename testsuite/wanted-results/{test09 => parallel-local11} (100%) rename testsuite/wanted-results/{test11 => parallel-local111} (100%) rename testsuite/wanted-results/{test14 => parallel-local114} (100%) rename testsuite/wanted-results/{test25 => parallel-local12} (100%) rename testsuite/wanted-results/{test20 => parallel-local120} (100%) rename testsuite/wanted-results/{test22 => parallel-local122} (100%) rename testsuite/wanted-results/{test29 => parallel-local129} (100%) rename testsuite/wanted-results/{test27 => parallel-local13} (100%) rename testsuite/wanted-results/{test39 => parallel-local139} (100%) rename testsuite/wanted-results/{test43 => parallel-local14} (100%) rename testsuite/wanted-results/{test40 => parallel-local140} (100%) rename testsuite/wanted-results/{test24 => parallel-local144} (100%) rename testsuite/wanted-results/{test28 => parallel-local148} (100%) rename testsuite/wanted-results/{test01 => parallel-local15} (100%) rename testsuite/wanted-results/{test50 => parallel-local150} (100%) rename testsuite/wanted-results/{test52 => parallel-local152} (100%) rename testsuite/wanted-results/{test44 => parallel-local153} (100%) rename testsuite/wanted-results/{test54 => parallel-local154} (100%) rename testsuite/wanted-results/{test48 => parallel-local155} (100%) rename testsuite/wanted-results/{test53 => parallel-local156} (100%) rename testsuite/wanted-results/{test57 => parallel-local157} (100%) rename testsuite/wanted-results/{test26 => parallel-local16} (100%) rename testsuite/wanted-results/{test55 => parallel-local163} (100%) rename testsuite/wanted-results/{test64 => parallel-local164} (100%) rename testsuite/wanted-results/{test56 => parallel-local17} (100%) rename testsuite/wanted-results/{test63 => parallel-local18} (100%) rename testsuite/wanted-results/{test16 => parallel-local19} (100%) rename testsuite/wanted-results/{test34 => parallel-local2} (100%) rename testsuite/wanted-results/{test31 => parallel-local20} (100%) rename testsuite/wanted-results/{test59 => parallel-local21} (100%) rename testsuite/wanted-results/{test10 => parallel-local22} (100%) rename testsuite/wanted-results/{test02 => parallel-local23} (100%) rename testsuite/wanted-results/{test33 => parallel-local3} (100%) rename testsuite/wanted-results/{test12 => parallel-local4} (100%) rename testsuite/wanted-results/{test51 => parallel-local5} (100%) rename testsuite/wanted-results/{test62 => parallel-local6} (100%) rename testsuite/wanted-results/{test58 => parallel-local7} (100%) rename testsuite/wanted-results/{test66 => parallel-local8} (100%) rename testsuite/wanted-results/{test49 => parallel-local9} (100%) delete mode 100644 testsuite/wanted-results/test42 diff --git a/testsuite/Makefile b/testsuite/Makefile index b3d14ef3..67c81b36 100644 --- a/testsuite/Makefile +++ b/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 diff --git a/testsuite/tests-to-run/test42.sh b/testsuite/tests-to-run/parallel-local1.sh similarity index 70% rename from testsuite/tests-to-run/test42.sh rename to testsuite/tests-to-run/parallel-local1.sh index 70d90f2b..7326971e 100644 --- a/testsuite/tests-to-run/test42.sh +++ b/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" diff --git a/testsuite/tests-to-run/test38.sh b/testsuite/tests-to-run/parallel-local10.sh similarity index 100% rename from testsuite/tests-to-run/test38.sh rename to testsuite/tests-to-run/parallel-local10.sh diff --git a/testsuite/tests-to-run/test03.sh b/testsuite/tests-to-run/parallel-local103.sh similarity index 100% rename from testsuite/tests-to-run/test03.sh rename to testsuite/tests-to-run/parallel-local103.sh diff --git a/testsuite/tests-to-run/test04.sh b/testsuite/tests-to-run/parallel-local104.sh similarity index 100% rename from testsuite/tests-to-run/test04.sh rename to testsuite/tests-to-run/parallel-local104.sh diff --git a/testsuite/tests-to-run/test05.sh b/testsuite/tests-to-run/parallel-local105.sh similarity index 100% rename from testsuite/tests-to-run/test05.sh rename to testsuite/tests-to-run/parallel-local105.sh diff --git a/testsuite/tests-to-run/test06.sh b/testsuite/tests-to-run/parallel-local106.sh similarity index 100% rename from testsuite/tests-to-run/test06.sh rename to testsuite/tests-to-run/parallel-local106.sh diff --git a/testsuite/tests-to-run/test07.sh b/testsuite/tests-to-run/parallel-local107.sh similarity index 100% rename from testsuite/tests-to-run/test07.sh rename to testsuite/tests-to-run/parallel-local107.sh diff --git a/testsuite/tests-to-run/test08.sh b/testsuite/tests-to-run/parallel-local108.sh similarity index 100% rename from testsuite/tests-to-run/test08.sh rename to testsuite/tests-to-run/parallel-local108.sh diff --git a/testsuite/tests-to-run/test09.sh b/testsuite/tests-to-run/parallel-local11.sh similarity index 100% rename from testsuite/tests-to-run/test09.sh rename to testsuite/tests-to-run/parallel-local11.sh diff --git a/testsuite/tests-to-run/test11.sh b/testsuite/tests-to-run/parallel-local111.sh similarity index 100% rename from testsuite/tests-to-run/test11.sh rename to testsuite/tests-to-run/parallel-local111.sh diff --git a/testsuite/tests-to-run/test14.sh b/testsuite/tests-to-run/parallel-local114.sh similarity index 100% rename from testsuite/tests-to-run/test14.sh rename to testsuite/tests-to-run/parallel-local114.sh diff --git a/testsuite/tests-to-run/test25.sh b/testsuite/tests-to-run/parallel-local12.sh similarity index 100% rename from testsuite/tests-to-run/test25.sh rename to testsuite/tests-to-run/parallel-local12.sh diff --git a/testsuite/tests-to-run/test20.sh b/testsuite/tests-to-run/parallel-local120.sh similarity index 100% rename from testsuite/tests-to-run/test20.sh rename to testsuite/tests-to-run/parallel-local120.sh diff --git a/testsuite/tests-to-run/test22.sh b/testsuite/tests-to-run/parallel-local122.sh similarity index 100% rename from testsuite/tests-to-run/test22.sh rename to testsuite/tests-to-run/parallel-local122.sh diff --git a/testsuite/tests-to-run/test29.sh b/testsuite/tests-to-run/parallel-local129.sh similarity index 100% rename from testsuite/tests-to-run/test29.sh rename to testsuite/tests-to-run/parallel-local129.sh diff --git a/testsuite/tests-to-run/test27.sh b/testsuite/tests-to-run/parallel-local13.sh similarity index 100% rename from testsuite/tests-to-run/test27.sh rename to testsuite/tests-to-run/parallel-local13.sh diff --git a/testsuite/tests-to-run/test39.sh b/testsuite/tests-to-run/parallel-local139.sh similarity index 100% rename from testsuite/tests-to-run/test39.sh rename to testsuite/tests-to-run/parallel-local139.sh diff --git a/testsuite/tests-to-run/test43.sh b/testsuite/tests-to-run/parallel-local14.sh similarity index 100% rename from testsuite/tests-to-run/test43.sh rename to testsuite/tests-to-run/parallel-local14.sh diff --git a/testsuite/tests-to-run/test40.sh b/testsuite/tests-to-run/parallel-local140.sh similarity index 100% rename from testsuite/tests-to-run/test40.sh rename to testsuite/tests-to-run/parallel-local140.sh diff --git a/testsuite/tests-to-run/test44.sh b/testsuite/tests-to-run/parallel-local144.sh similarity index 100% rename from testsuite/tests-to-run/test44.sh rename to testsuite/tests-to-run/parallel-local144.sh diff --git a/testsuite/tests-to-run/test48.sh b/testsuite/tests-to-run/parallel-local148.sh similarity index 100% rename from testsuite/tests-to-run/test48.sh rename to testsuite/tests-to-run/parallel-local148.sh diff --git a/testsuite/tests-to-run/test01.sh b/testsuite/tests-to-run/parallel-local15.sh similarity index 100% rename from testsuite/tests-to-run/test01.sh rename to testsuite/tests-to-run/parallel-local15.sh diff --git a/testsuite/tests-to-run/test50.sh b/testsuite/tests-to-run/parallel-local150.sh similarity index 100% rename from testsuite/tests-to-run/test50.sh rename to testsuite/tests-to-run/parallel-local150.sh diff --git a/testsuite/tests-to-run/test52.sh b/testsuite/tests-to-run/parallel-local152.sh similarity index 100% rename from testsuite/tests-to-run/test52.sh rename to testsuite/tests-to-run/parallel-local152.sh diff --git a/testsuite/tests-to-run/test53.sh b/testsuite/tests-to-run/parallel-local153.sh similarity index 100% rename from testsuite/tests-to-run/test53.sh rename to testsuite/tests-to-run/parallel-local153.sh diff --git a/testsuite/tests-to-run/test54.sh b/testsuite/tests-to-run/parallel-local154.sh similarity index 100% rename from testsuite/tests-to-run/test54.sh rename to testsuite/tests-to-run/parallel-local154.sh diff --git a/testsuite/tests-to-run/test24.sh b/testsuite/tests-to-run/parallel-local155.sh old mode 100755 new mode 100644 similarity index 100% rename from testsuite/tests-to-run/test24.sh rename to testsuite/tests-to-run/parallel-local155.sh diff --git a/testsuite/tests-to-run/test56.sh b/testsuite/tests-to-run/parallel-local156.sh similarity index 100% rename from testsuite/tests-to-run/test56.sh rename to testsuite/tests-to-run/parallel-local156.sh diff --git a/testsuite/tests-to-run/test57.sh b/testsuite/tests-to-run/parallel-local157.sh similarity index 100% rename from testsuite/tests-to-run/test57.sh rename to testsuite/tests-to-run/parallel-local157.sh diff --git a/testsuite/tests-to-run/test26.sh b/testsuite/tests-to-run/parallel-local16.sh similarity index 100% rename from testsuite/tests-to-run/test26.sh rename to testsuite/tests-to-run/parallel-local16.sh diff --git a/testsuite/tests-to-run/test63.sh b/testsuite/tests-to-run/parallel-local163.sh similarity index 100% rename from testsuite/tests-to-run/test63.sh rename to testsuite/tests-to-run/parallel-local163.sh diff --git a/testsuite/tests-to-run/test64.sh b/testsuite/tests-to-run/parallel-local164.sh similarity index 100% rename from testsuite/tests-to-run/test64.sh rename to testsuite/tests-to-run/parallel-local164.sh diff --git a/testsuite/tests-to-run/test55.sh b/testsuite/tests-to-run/parallel-local17.sh old mode 100644 new mode 100755 similarity index 100% rename from testsuite/tests-to-run/test55.sh rename to testsuite/tests-to-run/parallel-local17.sh diff --git a/testsuite/tests-to-run/test28.sh b/testsuite/tests-to-run/parallel-local18.sh similarity index 100% rename from testsuite/tests-to-run/test28.sh rename to testsuite/tests-to-run/parallel-local18.sh diff --git a/testsuite/tests-to-run/test16.sh b/testsuite/tests-to-run/parallel-local19.sh similarity index 100% rename from testsuite/tests-to-run/test16.sh rename to testsuite/tests-to-run/parallel-local19.sh diff --git a/testsuite/tests-to-run/test34.sh b/testsuite/tests-to-run/parallel-local2.sh similarity index 87% rename from testsuite/tests-to-run/test34.sh rename to testsuite/tests-to-run/parallel-local2.sh index adbef1ae..c1d549f8 100644 --- a/testsuite/tests-to-run/test34.sh +++ b/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 diff --git a/testsuite/tests-to-run/test31.sh b/testsuite/tests-to-run/parallel-local20.sh similarity index 100% rename from testsuite/tests-to-run/test31.sh rename to testsuite/tests-to-run/parallel-local20.sh diff --git a/testsuite/tests-to-run/test59.sh b/testsuite/tests-to-run/parallel-local21.sh similarity index 100% rename from testsuite/tests-to-run/test59.sh rename to testsuite/tests-to-run/parallel-local21.sh diff --git a/testsuite/tests-to-run/test10.sh b/testsuite/tests-to-run/parallel-local22.sh similarity index 100% rename from testsuite/tests-to-run/test10.sh rename to testsuite/tests-to-run/parallel-local22.sh diff --git a/testsuite/tests-to-run/test02.sh b/testsuite/tests-to-run/parallel-local23.sh similarity index 100% rename from testsuite/tests-to-run/test02.sh rename to testsuite/tests-to-run/parallel-local23.sh diff --git a/testsuite/tests-to-run/test33.sh b/testsuite/tests-to-run/parallel-local3.sh similarity index 100% rename from testsuite/tests-to-run/test33.sh rename to testsuite/tests-to-run/parallel-local3.sh diff --git a/testsuite/tests-to-run/test12.sh b/testsuite/tests-to-run/parallel-local4.sh old mode 100755 new mode 100644 similarity index 84% rename from testsuite/tests-to-run/test12.sh rename to testsuite/tests-to-run/parallel-local4.sh index 20266a26..38c7c05b --- a/testsuite/tests-to-run/test12.sh +++ b/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 diff --git a/testsuite/tests-to-run/test51.sh b/testsuite/tests-to-run/parallel-local5.sh similarity index 100% rename from testsuite/tests-to-run/test51.sh rename to testsuite/tests-to-run/parallel-local5.sh diff --git a/testsuite/tests-to-run/test62.sh b/testsuite/tests-to-run/parallel-local6.sh similarity index 100% rename from testsuite/tests-to-run/test62.sh rename to testsuite/tests-to-run/parallel-local6.sh diff --git a/testsuite/tests-to-run/test58.sh b/testsuite/tests-to-run/parallel-local7.sh similarity index 100% rename from testsuite/tests-to-run/test58.sh rename to testsuite/tests-to-run/parallel-local7.sh diff --git a/testsuite/tests-to-run/test66.sh b/testsuite/tests-to-run/parallel-local8.sh similarity index 100% rename from testsuite/tests-to-run/test66.sh rename to testsuite/tests-to-run/parallel-local8.sh diff --git a/testsuite/tests-to-run/test49.sh b/testsuite/tests-to-run/parallel-local9.sh similarity index 100% rename from testsuite/tests-to-run/test49.sh rename to testsuite/tests-to-run/parallel-local9.sh diff --git a/testsuite/tests-to-run/test23.sh b/testsuite/tests-to-run/test23.sh index 8a9f5141..656896cb 100644 --- a/testsuite/tests-to-run/test23.sh +++ b/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" diff --git a/testsuite/wanted-results/parallel-local1 b/testsuite/wanted-results/parallel-local1 new file mode 100644 index 00000000..9df3548f --- /dev/null +++ b/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 diff --git a/testsuite/wanted-results/test38 b/testsuite/wanted-results/parallel-local10 similarity index 100% rename from testsuite/wanted-results/test38 rename to testsuite/wanted-results/parallel-local10 diff --git a/testsuite/wanted-results/test03 b/testsuite/wanted-results/parallel-local103 similarity index 100% rename from testsuite/wanted-results/test03 rename to testsuite/wanted-results/parallel-local103 diff --git a/testsuite/wanted-results/test04 b/testsuite/wanted-results/parallel-local104 similarity index 100% rename from testsuite/wanted-results/test04 rename to testsuite/wanted-results/parallel-local104 diff --git a/testsuite/wanted-results/test05 b/testsuite/wanted-results/parallel-local105 similarity index 100% rename from testsuite/wanted-results/test05 rename to testsuite/wanted-results/parallel-local105 diff --git a/testsuite/wanted-results/test06 b/testsuite/wanted-results/parallel-local106 similarity index 100% rename from testsuite/wanted-results/test06 rename to testsuite/wanted-results/parallel-local106 diff --git a/testsuite/wanted-results/test07 b/testsuite/wanted-results/parallel-local107 similarity index 100% rename from testsuite/wanted-results/test07 rename to testsuite/wanted-results/parallel-local107 diff --git a/testsuite/wanted-results/test08 b/testsuite/wanted-results/parallel-local108 similarity index 100% rename from testsuite/wanted-results/test08 rename to testsuite/wanted-results/parallel-local108 diff --git a/testsuite/wanted-results/test09 b/testsuite/wanted-results/parallel-local11 similarity index 100% rename from testsuite/wanted-results/test09 rename to testsuite/wanted-results/parallel-local11 diff --git a/testsuite/wanted-results/test11 b/testsuite/wanted-results/parallel-local111 similarity index 100% rename from testsuite/wanted-results/test11 rename to testsuite/wanted-results/parallel-local111 diff --git a/testsuite/wanted-results/test14 b/testsuite/wanted-results/parallel-local114 similarity index 100% rename from testsuite/wanted-results/test14 rename to testsuite/wanted-results/parallel-local114 diff --git a/testsuite/wanted-results/test25 b/testsuite/wanted-results/parallel-local12 similarity index 100% rename from testsuite/wanted-results/test25 rename to testsuite/wanted-results/parallel-local12 diff --git a/testsuite/wanted-results/test20 b/testsuite/wanted-results/parallel-local120 similarity index 100% rename from testsuite/wanted-results/test20 rename to testsuite/wanted-results/parallel-local120 diff --git a/testsuite/wanted-results/test22 b/testsuite/wanted-results/parallel-local122 similarity index 100% rename from testsuite/wanted-results/test22 rename to testsuite/wanted-results/parallel-local122 diff --git a/testsuite/wanted-results/test29 b/testsuite/wanted-results/parallel-local129 similarity index 100% rename from testsuite/wanted-results/test29 rename to testsuite/wanted-results/parallel-local129 diff --git a/testsuite/wanted-results/test27 b/testsuite/wanted-results/parallel-local13 similarity index 100% rename from testsuite/wanted-results/test27 rename to testsuite/wanted-results/parallel-local13 diff --git a/testsuite/wanted-results/test39 b/testsuite/wanted-results/parallel-local139 similarity index 100% rename from testsuite/wanted-results/test39 rename to testsuite/wanted-results/parallel-local139 diff --git a/testsuite/wanted-results/test43 b/testsuite/wanted-results/parallel-local14 similarity index 100% rename from testsuite/wanted-results/test43 rename to testsuite/wanted-results/parallel-local14 diff --git a/testsuite/wanted-results/test40 b/testsuite/wanted-results/parallel-local140 similarity index 100% rename from testsuite/wanted-results/test40 rename to testsuite/wanted-results/parallel-local140 diff --git a/testsuite/wanted-results/test24 b/testsuite/wanted-results/parallel-local144 similarity index 100% rename from testsuite/wanted-results/test24 rename to testsuite/wanted-results/parallel-local144 diff --git a/testsuite/wanted-results/test28 b/testsuite/wanted-results/parallel-local148 similarity index 100% rename from testsuite/wanted-results/test28 rename to testsuite/wanted-results/parallel-local148 diff --git a/testsuite/wanted-results/test01 b/testsuite/wanted-results/parallel-local15 similarity index 100% rename from testsuite/wanted-results/test01 rename to testsuite/wanted-results/parallel-local15 diff --git a/testsuite/wanted-results/test50 b/testsuite/wanted-results/parallel-local150 similarity index 100% rename from testsuite/wanted-results/test50 rename to testsuite/wanted-results/parallel-local150 diff --git a/testsuite/wanted-results/test52 b/testsuite/wanted-results/parallel-local152 similarity index 100% rename from testsuite/wanted-results/test52 rename to testsuite/wanted-results/parallel-local152 diff --git a/testsuite/wanted-results/test44 b/testsuite/wanted-results/parallel-local153 similarity index 100% rename from testsuite/wanted-results/test44 rename to testsuite/wanted-results/parallel-local153 diff --git a/testsuite/wanted-results/test54 b/testsuite/wanted-results/parallel-local154 similarity index 100% rename from testsuite/wanted-results/test54 rename to testsuite/wanted-results/parallel-local154 diff --git a/testsuite/wanted-results/test48 b/testsuite/wanted-results/parallel-local155 similarity index 100% rename from testsuite/wanted-results/test48 rename to testsuite/wanted-results/parallel-local155 diff --git a/testsuite/wanted-results/test53 b/testsuite/wanted-results/parallel-local156 similarity index 100% rename from testsuite/wanted-results/test53 rename to testsuite/wanted-results/parallel-local156 diff --git a/testsuite/wanted-results/test57 b/testsuite/wanted-results/parallel-local157 similarity index 100% rename from testsuite/wanted-results/test57 rename to testsuite/wanted-results/parallel-local157 diff --git a/testsuite/wanted-results/test26 b/testsuite/wanted-results/parallel-local16 similarity index 100% rename from testsuite/wanted-results/test26 rename to testsuite/wanted-results/parallel-local16 diff --git a/testsuite/wanted-results/test55 b/testsuite/wanted-results/parallel-local163 similarity index 100% rename from testsuite/wanted-results/test55 rename to testsuite/wanted-results/parallel-local163 diff --git a/testsuite/wanted-results/test64 b/testsuite/wanted-results/parallel-local164 similarity index 100% rename from testsuite/wanted-results/test64 rename to testsuite/wanted-results/parallel-local164 diff --git a/testsuite/wanted-results/test56 b/testsuite/wanted-results/parallel-local17 similarity index 100% rename from testsuite/wanted-results/test56 rename to testsuite/wanted-results/parallel-local17 diff --git a/testsuite/wanted-results/test63 b/testsuite/wanted-results/parallel-local18 similarity index 100% rename from testsuite/wanted-results/test63 rename to testsuite/wanted-results/parallel-local18 diff --git a/testsuite/wanted-results/test16 b/testsuite/wanted-results/parallel-local19 similarity index 100% rename from testsuite/wanted-results/test16 rename to testsuite/wanted-results/parallel-local19 diff --git a/testsuite/wanted-results/test34 b/testsuite/wanted-results/parallel-local2 similarity index 100% rename from testsuite/wanted-results/test34 rename to testsuite/wanted-results/parallel-local2 diff --git a/testsuite/wanted-results/test31 b/testsuite/wanted-results/parallel-local20 similarity index 100% rename from testsuite/wanted-results/test31 rename to testsuite/wanted-results/parallel-local20 diff --git a/testsuite/wanted-results/test59 b/testsuite/wanted-results/parallel-local21 similarity index 100% rename from testsuite/wanted-results/test59 rename to testsuite/wanted-results/parallel-local21 diff --git a/testsuite/wanted-results/test10 b/testsuite/wanted-results/parallel-local22 similarity index 100% rename from testsuite/wanted-results/test10 rename to testsuite/wanted-results/parallel-local22 diff --git a/testsuite/wanted-results/test02 b/testsuite/wanted-results/parallel-local23 similarity index 100% rename from testsuite/wanted-results/test02 rename to testsuite/wanted-results/parallel-local23 diff --git a/testsuite/wanted-results/test33 b/testsuite/wanted-results/parallel-local3 similarity index 100% rename from testsuite/wanted-results/test33 rename to testsuite/wanted-results/parallel-local3 diff --git a/testsuite/wanted-results/test12 b/testsuite/wanted-results/parallel-local4 similarity index 100% rename from testsuite/wanted-results/test12 rename to testsuite/wanted-results/parallel-local4 diff --git a/testsuite/wanted-results/test51 b/testsuite/wanted-results/parallel-local5 similarity index 100% rename from testsuite/wanted-results/test51 rename to testsuite/wanted-results/parallel-local5 diff --git a/testsuite/wanted-results/test62 b/testsuite/wanted-results/parallel-local6 similarity index 100% rename from testsuite/wanted-results/test62 rename to testsuite/wanted-results/parallel-local6 diff --git a/testsuite/wanted-results/test58 b/testsuite/wanted-results/parallel-local7 similarity index 100% rename from testsuite/wanted-results/test58 rename to testsuite/wanted-results/parallel-local7 diff --git a/testsuite/wanted-results/test66 b/testsuite/wanted-results/parallel-local8 similarity index 100% rename from testsuite/wanted-results/test66 rename to testsuite/wanted-results/parallel-local8 diff --git a/testsuite/wanted-results/test49 b/testsuite/wanted-results/parallel-local9 similarity index 100% rename from testsuite/wanted-results/test49 rename to testsuite/wanted-results/parallel-local9 diff --git a/testsuite/wanted-results/test23 b/testsuite/wanted-results/test23 index d408a898..3a2aadd6 100644 --- a/testsuite/wanted-results/test23 +++ b/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 diff --git a/testsuite/wanted-results/test42 b/testsuite/wanted-results/test42 deleted file mode 100644 index b4bb056e..00000000 --- a/testsuite/wanted-results/test42 +++ /dev/null @@ -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