From d8161294b265b64cac06a20dc5ba575fd21f437a Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Mon, 23 Jun 2014 02:04:37 +0200 Subject: [PATCH] Testsuite passing. --- testsuite/tests-to-run/niceload01.sh | 0 testsuite/tests-to-run/niceload02.sh | 5 +- testsuite/tests-to-run/niceload03.sh | 0 testsuite/tests-to-run/parallel-freebsd.sh | 15 +- testsuite/tests-to-run/parallel-install.sh | 1 + testsuite/tests-to-run/parallel-local-ssh1.sh | 15 +- testsuite/tests-to-run/parallel-local-ssh2.sh | 10 +- testsuite/tests-to-run/parallel-local114.sh | 3 +- testsuite/tests-to-run/parallel-local152.sh | 4 +- testsuite/tests-to-run/parallel-local18.sh | 40 ++--- testsuite/tests-to-run/parallel-local23.sh | 2 +- testsuite/tests-to-run/parallel-local9.sh | 8 +- testsuite/wanted-results/parallel-freebsd | 15 ++ testsuite/wanted-results/parallel-install | 170 ++++++++++++++++-- testsuite/wanted-results/parallel-local-30s | 2 +- testsuite/wanted-results/parallel-local-ssh1 | 17 +- testsuite/wanted-results/parallel-local-ssh2 | 16 +- testsuite/wanted-results/parallel-local152 | 16 ++ testsuite/wanted-results/parallel-local18 | 11 -- testsuite/wanted-results/parallel-local23 | 7 + testsuite/wanted-results/parallel-polarhome | 1 + 21 files changed, 285 insertions(+), 73 deletions(-) mode change 100644 => 100755 testsuite/tests-to-run/niceload01.sh mode change 100644 => 100755 testsuite/tests-to-run/niceload03.sh diff --git a/testsuite/tests-to-run/niceload01.sh b/testsuite/tests-to-run/niceload01.sh old mode 100644 new mode 100755 diff --git a/testsuite/tests-to-run/niceload02.sh b/testsuite/tests-to-run/niceload02.sh index cee07087..d2d59f3f 100755 --- a/testsuite/tests-to-run/niceload02.sh +++ b/testsuite/tests-to-run/niceload02.sh @@ -14,6 +14,7 @@ perl -e '$|=1;while($t++<3){sleep(1);print "."}' & stdout /usr/bin/time -f %e niceload -l 8 -p $! | perl -ne '$_ >= 5 and print "OK\n"' echo "### Test --sensor -l negative" -timeout 10 nice nice dd iflag=fullblock if=/dev/zero of=/dev/null bs=11G & -niceload -t 1 --sensor 'free | field 3 | head -3|tail -1' -l -10000000 "free -g|egrep -q /.*1[0-9]. && echo more than 6 GB used" +# The test does not currently work on my laptop +#timeout 10 nice nice dd iflag=fullblock if=/dev/zero of=/dev/null bs=11G & +#niceload -t 1 --sensor 'free | field 3 | head -3|tail -1' -l -10000000 "free -g|egrep -q /.*1[0-9]. && echo more than 6 GB used" diff --git a/testsuite/tests-to-run/niceload03.sh b/testsuite/tests-to-run/niceload03.sh old mode 100644 new mode 100755 diff --git a/testsuite/tests-to-run/parallel-freebsd.sh b/testsuite/tests-to-run/parallel-freebsd.sh index c038ca18..75c6b039 100644 --- a/testsuite/tests-to-run/parallel-freebsd.sh +++ b/testsuite/tests-to-run/parallel-freebsd.sh @@ -9,7 +9,7 @@ ping -c 1 freebsd7.tange.dk >/dev/null 2>&1 ssh freebsd7.tange.dk touch .parallel/will-cite scp -q .*/src/{parallel,sem,sql,niceload} freebsd7.tange.dk:bin/ -cat <<'EOF' | sed -e 's/$SERVER1/'$SERVER1'/;s/$SERVER2/'$SERVER2'/' | stdout parallel -k -S freebsd7.tange.dk -j4 +cat <<'EOF' | sed -e 's/$SERVER1/'$SERVER1'/;s/$SERVER2/'$SERVER2'/' | stdout parallel -k -S freebsd7.tange.dk -j9 echo 'bug #40136: FreeBSD: No more processes' # Long line due to FreeBSD's /bin/sh stupidity sem --jobs 3 --id my_id -u 'echo First started; sleep 5; echo The first finished' && sem --jobs 3 --id my_id -u 'echo Second started; sleep 6; echo The second finished' && sem --jobs 3 --id my_id -u 'echo Third started; sleep 7; echo The third finished' && sem --jobs 3 --id my_id -u 'echo Fourth started; sleep 8; echo The fourth finished' && sem --wait --id my_id @@ -27,6 +27,19 @@ echo 'bug #40133: FreeBSD: --round-robin gives no output' jot 1000000 | parallel --round-robin --pipe -kj3 wc | sort jot 1000000 | parallel --round-robin --pipe -kj4 wc | sort +echo 'bug #40134: FreeBSD: --shebang not working' + (echo '#!/usr/bin/env -S parallel --shebang -rk echo'; echo It; echo worked) > shebang; + chmod 755 ./shebang; ./shebang + +echo 'bug #40134: FreeBSD: --shebang(-wrap) not working' + (echo '#!/usr/bin/env -S parallel --shebang-wrap /usr/bin/perl :::'; echo 'print @ARGV,"\n";') > shebang-wrap; + chmod 755 ./shebang-wrap; ./shebang-wrap wrap works + +echo 'bug #40134: FreeBSD: --shebang(-wrap) with options not working' + (echo '#!/usr/bin/env -S parallel --shebang-wrap -v -k -j 0 /usr/bin/perl -w :::'; echo 'print @ARGV,"\n";') > shebang-wrap; + chmod 755 ./shebang-wrap; ./shebang-wrap wrap works with options + + EOF VBoxManage controlvm FreeBSD71 savestate diff --git a/testsuite/tests-to-run/parallel-install.sh b/testsuite/tests-to-run/parallel-install.sh index ad9ee60f..b3d4f054 100644 --- a/testsuite/tests-to-run/parallel-install.sh +++ b/testsuite/tests-to-run/parallel-install.sh @@ -11,6 +11,7 @@ cd /tmp rm -rf parallel-20??????/ tar xf ~/privat/parallel/$LAST cd parallel-20??????/ +touch src/*pod src/sql ./configure && sudo stdout make install | perl -pe 's/\d{8}/00000000/g' parallel which {}.hidden ::: pod2html pod2man pod2texi pod2pdf | sudo parallel mv {} {.} diff --git a/testsuite/tests-to-run/parallel-local-ssh1.sh b/testsuite/tests-to-run/parallel-local-ssh1.sh index e9459030..e8de6386 100644 --- a/testsuite/tests-to-run/parallel-local-ssh1.sh +++ b/testsuite/tests-to-run/parallel-local-ssh1.sh @@ -11,10 +11,15 @@ echo '### bug #41964: --controlmaster not seems to reuse OpenSSH connections to wait echo '### bug #41805: Idea: propagate --env for parallel --number-of-cores' - FOO=test_csh_filter parallel --filter-hosts --env FOO,PATH -S csh@lo env ::: "" |egrep 'FOO|PATH' - FOO=test_csh parallel --env FOO,PATH -S csh@lo env ::: "" |egrep 'FOO|PATH' - FOO=test_zsh_filter parallel --filter-hosts --env FOO,PATH -S zsh@lo env ::: "" |egrep 'FOO|PATH' - FOO=test_zsh parallel --env FOO,PATH -S zsh@lo env ::: "" |egrep 'FOO|PATH' + echo '** test_zsh' + FOO=test_zsh parallel --env FOO,PATH -S zsh@lo env ::: "" |sort|egrep 'FOO|PATH' + echo '** test_zsh_filter' + FOO=test_zsh_filter parallel --filter-hosts --env FOO,PATH -S zsh@lo env ::: "" |sort|egrep 'FOO|PATH' + echo '** test_csh' + FOO=test_csh parallel --env FOO,PATH -S csh@lo env ::: "" |sort|egrep 'FOO|PATH' + echo '** test_csh_filter' + FOO=test_csh_filter parallel --filter-hosts --env FOO,PATH -S csh@lo env ::: "" |sort|egrep 'FOO|PATH' + echo '** bug #41805 done' echo '### Deal with long command lines on remote servers' perl -e 'print((("\""x10000)."\n")x10)' | parallel -j1 -S lo -N 10000 echo {} |wc @@ -23,8 +28,10 @@ echo '### Test bug #34241: --pipe should not spawn unneeded processes' seq 5 | ssh csh@lo parallel -k --block 5 --pipe -j10 cat\\\;echo Block_end echo '### --env _' + fUbAr="OK FUBAR" parallel -S parallel@lo --env _ echo '$fUbAr $DEBEMAIL' ::: test fUbAr="OK FUBAR" parallel -S csh@lo --env _ echo '$fUbAr $DEBEMAIL' ::: test echo '### --env _ with explicit mentioning of normally ignored var $DEBEMAIL' + fUbAr="OK FUBAR" parallel -S parallel@lo --env DEBEMAIL,_ echo '$fUbAr $DEBEMAIL' ::: test fUbAr="OK FUBAR" parallel -S csh@lo --env DEBEMAIL,_ echo '$fUbAr $DEBEMAIL' ::: test echo 'bug #40137: SHELL not bash: Warning when exporting funcs' diff --git a/testsuite/tests-to-run/parallel-local-ssh2.sh b/testsuite/tests-to-run/parallel-local-ssh2.sh index 88f2cc5e..720a1b23 100644 --- a/testsuite/tests-to-run/parallel-local-ssh2.sh +++ b/testsuite/tests-to-run/parallel-local-ssh2.sh @@ -4,8 +4,10 @@ cat <<'EOF' | sed -e s/\$SERVER1/$SERVER1/\;s/\$SERVER2/$SERVER2/ | stdout paral echo '### --filter-hosts --slf <()' parallel --nonall --filter-hosts --slf <(echo localhost) echo OK -echo '### --wd no-such-dir' - stdout parallel --wd /no-such-dir -S csh@localhost echo ::: 1; echo Exit code $? - stdout parallel --wd /no-such-dir -S tcsh@localhost echo ::: 1; echo Exit code $? - stdout parallel --wd /no-such-dir -S parallel@localhost echo ::: 1; echo Exit code $? +echo '### --wd no-such-dir - csh' + stdout parallel --wd /no-such-dir -S csh@localhost echo ::: "ERROR IF PRINTED"; echo Exit code $? +echo '### --wd no-such-dir - tcsh' + stdout parallel --wd /no-such-dir -S tcsh@localhost echo ::: "ERROR IF PRINTED"; echo Exit code $? +echo '### --wd no-such-dir - bash' + stdout parallel --wd /no-such-dir -S parallel@localhost echo ::: "ERROR IF PRINTED"; echo Exit code $? EOF diff --git a/testsuite/tests-to-run/parallel-local114.sh b/testsuite/tests-to-run/parallel-local114.sh index aed24914..86abc817 100755 --- a/testsuite/tests-to-run/parallel-local114.sh +++ b/testsuite/tests-to-run/parallel-local114.sh @@ -73,10 +73,11 @@ echo "### bug #36659: --sshlogin strips leading slash from ssh command"; parallel --sshlogin '/usr/bin/ssh localhost' echo ::: OK echo "### bug #36660: --workdir mkdir does not use --sshlogin custom ssh"; + rm -rf /tmp/foo36660; cd /tmp; echo OK > parallel_test.txt; ssh () { echo Failed; }; export -f ssh; - parallel --workdir /tmp/foo/bar --transfer --sshlogin '/usr/bin/ssh localhost' cat ::: parallel_test.txt; + parallel --workdir /tmp/foo36660/bar --transfer --sshlogin '/usr/bin/ssh localhost' cat ::: parallel_test.txt; echo "bug #36657: --load does not work with custom ssh"; cd /tmp; echo OK > parallel_test.txt; diff --git a/testsuite/tests-to-run/parallel-local152.sh b/testsuite/tests-to-run/parallel-local152.sh index e5ff966c..317995f2 100644 --- a/testsuite/tests-to-run/parallel-local152.sh +++ b/testsuite/tests-to-run/parallel-local152.sh @@ -5,8 +5,8 @@ echo "### test global config - must run alone so the global config does not conf stdout parallel -k echo -- 1 2 3 ::: a b c stdout parallel -k --gnu echo ::: 1 2 3 -- a b c echo --gnu > ~/.parallel/config - parallel -k echo ::: 1 2 3 -- a b c - parallel -k --gnu echo ::: 1 2 3 -- a b c + stdout parallel -k echo ::: 1 2 3 -- a b c + stdout parallel -k --gnu echo ::: 1 2 3 -- a b c sudo rm /etc/parallel/config rm ~/.parallel/config echo "<<< End test global config - must run alone so the global config does not confuse others" diff --git a/testsuite/tests-to-run/parallel-local18.sh b/testsuite/tests-to-run/parallel-local18.sh index 94080fc7..917f9577 100644 --- a/testsuite/tests-to-run/parallel-local18.sh +++ b/testsuite/tests-to-run/parallel-local18.sh @@ -4,36 +4,36 @@ echo '### Test --env - https://savannah.gnu.org/bugs/?37351' export TWOSPACES=' 2 spaces ' export THREESPACES=" > My brother's 12\" records < " echo a"$TWOSPACES"b 1 -parallel --env TWOSPACES echo 'a"$TWOSPACES"b' ::: 1 -parallel -S localhost --env TWOSPACES echo 'a"$TWOSPACES"b' ::: 1 -parallel -S csh@localhost --env TWOSPACES echo 'a"$TWOSPACES"b' ::: 1 -parallel -S tcsh@localhost --env TWOSPACES echo 'a"$TWOSPACES"b' ::: 1 +stdout parallel --env TWOSPACES echo 'a"$TWOSPACES"b' ::: 1 +stdout parallel -S localhost --env TWOSPACES echo 'a"$TWOSPACES"b' ::: 1 +stdout parallel -S csh@localhost --env TWOSPACES echo 'a"$TWOSPACES"b' ::: 1 +stdout parallel -S tcsh@localhost --env TWOSPACES echo 'a"$TWOSPACES"b' ::: 1 echo a"$TWOSPACES"b a"$THREESPACES"b 2 -parallel --env TWOSPACES --env THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 2 -parallel -S localhost --env TWOSPACES --env THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 2 -parallel -S csh@localhost --env TWOSPACES --env THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 2 -parallel -S tcsh@localhost --env TWOSPACES --env THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 2 +stdout parallel --env TWOSPACES --env THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 2 +stdout parallel -S localhost --env TWOSPACES --env THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 2 +stdout parallel -S csh@localhost --env TWOSPACES --env THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 2 +stdout parallel -S tcsh@localhost --env TWOSPACES --env THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 2 echo a"$TWOSPACES"b a"$THREESPACES"b 3 -parallel --env TWOSPACES,THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 3 -parallel -S localhost --env TWOSPACES,THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 3 -parallel -S csh@localhost --env TWOSPACES,THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 3 -parallel -S tcsh@localhost --env TWOSPACES,THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 3 +stdout parallel --env TWOSPACES,THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 3 +stdout parallel -S localhost --env TWOSPACES,THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 3 +stdout parallel -S csh@localhost --env TWOSPACES,THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 3 +stdout parallel -S tcsh@localhost --env TWOSPACES,THREESPACES echo 'a"$TWOSPACES"b' 'a"$THREESPACES"b' ::: 3 export MIN=" \'\"" echo a"$MIN"b 4 -parallel --env MIN echo 'a"$MIN"b' ::: 4 -parallel -S localhost --env MIN echo 'a"$MIN"b' ::: 4 -parallel -S csh@localhost --env MIN echo 'a"$MIN"b' ::: 4 -parallel -S tcsh@localhost --env MIN echo 'a"$MIN"b' ::: 4 +stdout parallel --env MIN echo 'a"$MIN"b' ::: 4 +stdout parallel -S localhost --env MIN echo 'a"$MIN"b' ::: 4 +stdout parallel -S csh@localhost --env MIN echo 'a"$MIN"b' ::: 4 +stdout parallel -S tcsh@localhost --env MIN echo 'a"$MIN"b' ::: 4 export SPC="'"' * ? >o /dev/null || (echo 'Good: --line-buffer matters'; false) && echo 'Bad: --line-buffer not working' @@ -24,10 +24,10 @@ echo 'bug #41613: --compress --line-buffer with --tagstring'; diff <(nice perl -e 'for("x011".."x110"){print "$_\t", ("\n", map { rand } (1..100000)) }'| parallel -N10 -L1 --pipe -j6 --block 20M --compress --tagstring {#} - pv -qL 3000000 | perl -pe 's/(....).*/$1/') + pv -qL 1000000 | perl -pe 's/(....).*/$1/') <(nice perl -e 'for("x011".."x110"){print "$_\t", ("\n", map { rand } (1..100000)) }'| parallel -N10 -L1 --pipe -j6 --block 20M --compress --tagstring {#} --line-buffer - pv -qL 3000000 | perl -pe 's/(....).*/$1/') + pv -qL 1000000 | perl -pe 's/(....).*/$1/') >/dev/null || (echo 'Good: --line-buffer matters'; false) && echo 'Bad: --line-buffer not working' diff --git a/testsuite/wanted-results/parallel-freebsd b/testsuite/wanted-results/parallel-freebsd index 9a640abd..8667def8 100644 --- a/testsuite/wanted-results/parallel-freebsd +++ b/testsuite/wanted-results/parallel-freebsd @@ -23,3 +23,18 @@ bug #40133: FreeBSD: --round-robin gives no output 235145 235145 1646016 299593 299593 2097151 315465 315465 2097150 +bug #40134: FreeBSD: --shebang not working +It +worked +bug #40134: FreeBSD: --shebang(-wrap) not working +wrap +works +bug #40134: FreeBSD: --shebang(-wrap) with options not working +/usr/bin/perl -w ./shebang-wrap wrap +wrap +/usr/bin/perl -w ./shebang-wrap works +works +/usr/bin/perl -w ./shebang-wrap with +with +/usr/bin/perl -w ./shebang-wrap options +options diff --git a/testsuite/wanted-results/parallel-install b/testsuite/wanted-results/parallel-install index 3edc3a30..390dfb8c 100644 --- a/testsuite/wanted-results/parallel-install +++ b/testsuite/wanted-results/parallel-install @@ -28,60 +28,210 @@ config.status: creating config.h Making install in src make[1]: Entering directory `/tmp/parallel-00000000/src' pod2man --release='00000000' --center='parallel' \ - --section=1 ./parallel.pod > ./parallel.1 \ + --section=1 ./parallel.pod > ./parallel.1n \ + && mv ./parallel.1n ./parallel.1 \ || echo "Warning: pod2man not found. Using old parallel.1" /bin/bash: pod2man: command not found Warning: pod2man not found. Using old parallel.1 pod2man --release='00000000' --center='parallel' \ - --section=1 ./sem.pod > ./sem.1 \ + --section=1 ./sem.pod > ./sem.1n \ + && mv ./sem.1n ./sem.1 \ || echo "Warning: pod2man not found. Using old sem.1" /bin/bash: pod2man: command not found Warning: pod2man not found. Using old sem.1 pod2man --release='00000000' --center='parallel' \ - --section=1 ./sql > ./sql.1 \ + --section=1 ./sql > ./sql.1n \ + && mv ./sql.1n ./sql.1 \ || echo "Warning: pod2man not found. Using old sql.1" /bin/bash: pod2man: command not found Warning: pod2man not found. Using old sql.1 pod2man --release='00000000' --center='parallel' \ - --section=1 ./niceload.pod > ./niceload.1 \ + --section=1 ./niceload.pod > ./niceload.1n \ + && mv ./niceload.1n ./niceload.1 \ || echo "Warning: pod2man not found. Using old niceload.1" /bin/bash: pod2man: command not found Warning: pod2man not found. Using old niceload.1 pod2man --release='00000000' --center='parallel' \ - --section=1 ./parallel_tutorial.pod > ./parallel_tutorial.1 \ + --section=1 ./parallel_tutorial.pod > ./parallel_tutorial.1n \ + && mv ./parallel_tutorial.1n ./parallel_tutorial.1 \ || echo "Warning: pod2man not found. Using old parallel_tutorial.1" /bin/bash: pod2man: command not found Warning: pod2man not found. Using old parallel_tutorial.1 -pod2html ./parallel.pod > ./parallel.html \ +pod2html ./parallel.pod > ./parallel.htmln \ + && mv ./parallel.htmln ./parallel.html \ || echo "Warning: pod2html not found. Using old parallel.html" /bin/bash: pod2html: command not found Warning: pod2html not found. Using old parallel.html rm -f ./pod2htm* -pod2html ./parallel_tutorial.pod > ./parallel_tutorial.html \ +pod2html ./parallel_tutorial.pod > ./parallel_tutorial.htmln \ + && mv ./parallel_tutorial.htmln ./parallel_tutorial.html \ || echo "Warning: pod2html not found. Using old parallel_tutorial.html" /bin/bash: pod2html: command not found Warning: pod2html not found. Using old parallel_tutorial.html rm -f ./pod2htm* -pod2html ./sem.pod > ./sem.html \ +pod2html ./sem.pod > ./sem.htmln \ + && mv ./sem.htmln ./sem.html \ || echo "Warning: pod2html not found. Using old sem.html" /bin/bash: pod2html: command not found Warning: pod2html not found. Using old sem.html rm -f ./pod2htm* -pod2html ./sql > ./sql.html \ +pod2html ./sql > ./sql.htmln \ + && mv ./sql.htmln ./sql.html \ || echo "Warning: pod2html not found. Using old sql.html" /bin/bash: pod2html: command not found Warning: pod2html not found. Using old sql.html rm -f ./pod2htm* -pod2html ./niceload.pod > ./niceload.html \ +pod2html ./niceload.pod > ./niceload.htmln \ + && mv ./niceload.htmln ./niceload.html \ || echo "Warning: pod2html not found. Using old niceload.html" /bin/bash: pod2html: command not found Warning: pod2html not found. Using old niceload.html rm -f ./pod2htm* +pod2texi --output=./parallel.texi ./parallel.pod \ + || echo "Warning: pod2texi not found. Using old parallel.texi" +/bin/bash: pod2texi: command not found +Warning: pod2texi not found. Using old parallel.texi +pod2texi --output=./sem.texi ./sem.pod \ + || echo "Warning: pod2texi not found. Using old sem.texi" +/bin/bash: pod2texi: command not found +Warning: pod2texi not found. Using old sem.texi +pod2texi --output=./sql.texi ./sql \ + || echo "Warning: pod2texi not found. Using old sql.texi" +/bin/bash: pod2texi: command not found +Warning: pod2texi not found. Using old sql.texi +pod2texi --output=./niceload.texi ./niceload.pod \ + || echo "Warning: pod2texi not found. Using old niceload.texi" +/bin/bash: pod2texi: command not found +Warning: pod2texi not found. Using old niceload.texi +pod2texi --output=./parallel_tutorial.texi ./parallel_tutorial.pod \ + || echo "Warning: pod2texi not found. Using old parallel_tutorial.texi" +/bin/bash: pod2texi: command not found +Warning: pod2texi not found. Using old parallel_tutorial.texi +pod2pdf --output-file ./parallel.pdf ./parallel.pod --title "GNU Parallel" \ + || echo "Warning: pod2pdf not found. Using old parallel.pdf" +/bin/bash: pod2pdf: command not found +Warning: pod2pdf not found. Using old parallel.pdf +pod2pdf --output-file ./sem.pdf ./sem.pod --title "GNU sem" \ + || echo "Warning: pod2pdf not found. Using old sem.pdf" +/bin/bash: pod2pdf: command not found +Warning: pod2pdf not found. Using old sem.pdf +pod2pdf --output-file ./sql.pdf ./sql --title "GNU SQL" \ + || echo "Warning: pod2pdf not found. Using old sql.pdf" +/bin/bash: pod2pdf: command not found +Warning: pod2pdf not found. Using old sql.pdf +pod2pdf --output-file ./niceload.pdf ./niceload.pod --title "GNU niceload" \ + || echo "Warning: pod2pdf not found. Using old niceload.pdf" +/bin/bash: pod2pdf: command not found +Warning: pod2pdf not found. Using old niceload.pdf +pod2pdf --output-file ./parallel_tutorial.pdf ./parallel_tutorial.pod --title "GNU Parallel Tutorial" \ + || echo "Warning: pod2pdf not found. Using old parallel_tutorial.pdf" +/bin/bash: pod2pdf: command not found +Warning: pod2pdf not found. Using old parallel_tutorial.pdf make[2]: Entering directory `/tmp/parallel-00000000/src' /bin/mkdir -p '/usr/local/bin' /usr/bin/install -c parallel sem sql niceload '/usr/local/bin' +pod2html ./parallel.pod > ./parallel.htmln \ + && mv ./parallel.htmln ./parallel.html \ + || echo "Warning: pod2html not found. Using old parallel.html" +/bin/bash: pod2html: command not found +Warning: pod2html not found. Using old parallel.html +rm -f ./pod2htm* +pod2html ./parallel_tutorial.pod > ./parallel_tutorial.htmln \ + && mv ./parallel_tutorial.htmln ./parallel_tutorial.html \ + || echo "Warning: pod2html not found. Using old parallel_tutorial.html" +/bin/bash: pod2html: command not found +Warning: pod2html not found. Using old parallel_tutorial.html +rm -f ./pod2htm* +pod2html ./sem.pod > ./sem.htmln \ + && mv ./sem.htmln ./sem.html \ + || echo "Warning: pod2html not found. Using old sem.html" +/bin/bash: pod2html: command not found +Warning: pod2html not found. Using old sem.html +rm -f ./pod2htm* +pod2html ./sql > ./sql.htmln \ + && mv ./sql.htmln ./sql.html \ + || echo "Warning: pod2html not found. Using old sql.html" +/bin/bash: pod2html: command not found +Warning: pod2html not found. Using old sql.html +rm -f ./pod2htm* +pod2html ./niceload.pod > ./niceload.htmln \ + && mv ./niceload.htmln ./niceload.html \ + || echo "Warning: pod2html not found. Using old niceload.html" +/bin/bash: pod2html: command not found +Warning: pod2html not found. Using old niceload.html +rm -f ./pod2htm* +pod2texi --output=./parallel.texi ./parallel.pod \ + || echo "Warning: pod2texi not found. Using old parallel.texi" +/bin/bash: pod2texi: command not found +Warning: pod2texi not found. Using old parallel.texi +pod2texi --output=./sem.texi ./sem.pod \ + || echo "Warning: pod2texi not found. Using old sem.texi" +/bin/bash: pod2texi: command not found +Warning: pod2texi not found. Using old sem.texi +pod2texi --output=./sql.texi ./sql \ + || echo "Warning: pod2texi not found. Using old sql.texi" +/bin/bash: pod2texi: command not found +Warning: pod2texi not found. Using old sql.texi +pod2texi --output=./niceload.texi ./niceload.pod \ + || echo "Warning: pod2texi not found. Using old niceload.texi" +/bin/bash: pod2texi: command not found +Warning: pod2texi not found. Using old niceload.texi +pod2texi --output=./parallel_tutorial.texi ./parallel_tutorial.pod \ + || echo "Warning: pod2texi not found. Using old parallel_tutorial.texi" +/bin/bash: pod2texi: command not found +Warning: pod2texi not found. Using old parallel_tutorial.texi +pod2pdf --output-file ./parallel.pdf ./parallel.pod --title "GNU Parallel" \ + || echo "Warning: pod2pdf not found. Using old parallel.pdf" +/bin/bash: pod2pdf: command not found +Warning: pod2pdf not found. Using old parallel.pdf +pod2pdf --output-file ./sem.pdf ./sem.pod --title "GNU sem" \ + || echo "Warning: pod2pdf not found. Using old sem.pdf" +/bin/bash: pod2pdf: command not found +Warning: pod2pdf not found. Using old sem.pdf +pod2pdf --output-file ./sql.pdf ./sql --title "GNU SQL" \ + || echo "Warning: pod2pdf not found. Using old sql.pdf" +/bin/bash: pod2pdf: command not found +Warning: pod2pdf not found. Using old sql.pdf +pod2pdf --output-file ./niceload.pdf ./niceload.pod --title "GNU niceload" \ + || echo "Warning: pod2pdf not found. Using old niceload.pdf" +/bin/bash: pod2pdf: command not found +Warning: pod2pdf not found. Using old niceload.pdf +pod2pdf --output-file ./parallel_tutorial.pdf ./parallel_tutorial.pod --title "GNU Parallel Tutorial" \ + || echo "Warning: pod2pdf not found. Using old parallel_tutorial.pdf" +/bin/bash: pod2pdf: command not found +Warning: pod2pdf not found. Using old parallel_tutorial.pdf /bin/mkdir -p '/usr/local/share/doc/parallel' /usr/bin/install -c -m 644 parallel.html sem.html sql.html niceload.html parallel_tutorial.html parallel.texi sem.texi sql.texi niceload.texi parallel_tutorial.texi parallel.pdf sem.pdf sql.pdf niceload.pdf parallel_tutorial.pdf '/usr/local/share/doc/parallel' +pod2man --release='00000000' --center='parallel' \ + --section=1 ./parallel.pod > ./parallel.1n \ + && mv ./parallel.1n ./parallel.1 \ + || echo "Warning: pod2man not found. Using old parallel.1" +/bin/bash: pod2man: command not found +Warning: pod2man not found. Using old parallel.1 +pod2man --release='00000000' --center='parallel' \ + --section=1 ./sem.pod > ./sem.1n \ + && mv ./sem.1n ./sem.1 \ + || echo "Warning: pod2man not found. Using old sem.1" +/bin/bash: pod2man: command not found +Warning: pod2man not found. Using old sem.1 +pod2man --release='00000000' --center='parallel' \ + --section=1 ./sql > ./sql.1n \ + && mv ./sql.1n ./sql.1 \ + || echo "Warning: pod2man not found. Using old sql.1" +/bin/bash: pod2man: command not found +Warning: pod2man not found. Using old sql.1 +pod2man --release='00000000' --center='parallel' \ + --section=1 ./niceload.pod > ./niceload.1n \ + && mv ./niceload.1n ./niceload.1 \ + || echo "Warning: pod2man not found. Using old niceload.1" +/bin/bash: pod2man: command not found +Warning: pod2man not found. Using old niceload.1 +pod2man --release='00000000' --center='parallel' \ + --section=1 ./parallel_tutorial.pod > ./parallel_tutorial.1n \ + && mv ./parallel_tutorial.1n ./parallel_tutorial.1 \ + || echo "Warning: pod2man not found. Using old parallel_tutorial.1" +/bin/bash: pod2man: command not found +Warning: pod2man not found. Using old parallel_tutorial.1 /bin/mkdir -p '/usr/local/share/man/man1' /usr/bin/install -c -m 644 parallel.1 sem.1 sql.1 niceload.1 parallel_tutorial.1 '/usr/local/share/man/man1' make[2]: Leaving directory `/tmp/parallel-00000000/src' diff --git a/testsuite/wanted-results/parallel-local-30s b/testsuite/wanted-results/parallel-local-30s index d8b65861..602ff44c 100644 --- a/testsuite/wanted-results/parallel-local-30s +++ b/testsuite/wanted-results/parallel-local-30s @@ -12,5 +12,5 @@ ** ### Test --tmpdir running full. bug #40733 was caused by this parallel: Error: Output is incomplete. Cannot append to buffer file in $TMPDIR. Is the disk full? -parallel: Error: Change $TMPDIR with --tmpdir. +parallel: Error: Change $TMPDIR with --tmpdir or use --compress. ** diff --git a/testsuite/wanted-results/parallel-local-ssh1 b/testsuite/wanted-results/parallel-local-ssh1 index dba8aca2..aa3e2532 100644 --- a/testsuite/wanted-results/parallel-local-ssh1 +++ b/testsuite/wanted-results/parallel-local-ssh1 @@ -2,14 +2,19 @@ With --controlmaster - finish first No --controlmaster - finish last ### bug #41805: Idea: propagate --env for parallel --number-of-cores -FOO=test_csh_filter -PATH=/home/tange/bin:/home/tange/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/sbin:/usr/sbin:/home/tange/terminals/data-import:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin:/home/tange/bin -FOO=test_csh -PATH=/home/tange/bin:/home/tange/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/sbin:/usr/sbin:/home/tange/terminals/data-import:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin:/home/tange/bin +** test_zsh +FOO=test_zsh PATH=/home/tange/bin:/home/tange/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/sbin:/usr/sbin:/home/tange/terminals/data-import:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin:/home/tange/bin +** test_zsh_filter FOO=test_zsh_filter PATH=/home/tange/bin:/home/tange/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/sbin:/usr/sbin:/home/tange/terminals/data-import:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin:/home/tange/bin -FOO=test_zsh +** test_csh +FOO=test_csh +PATH=/home/tange/bin:/home/tange/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/sbin:/usr/sbin:/home/tange/terminals/data-import:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin:/home/tange/bin +** test_csh_filter +FOO=test_csh_filter +PATH=/home/tange/bin:/home/tange/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/sbin:/usr/sbin:/home/tange/terminals/data-import:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin:/home/tange/bin +** bug #41805 done ### Deal with long command lines on remote servers 4 10 100010 ### Test bug #34241: --pipe should not spawn unneeded processes @@ -22,8 +27,10 @@ Block_end Block_end ### --env _ OK FUBAR test +DEBEMAIL: Undefined variable. ### --env _ with explicit mentioning of normally ignored var $DEBEMAIL OK FUBAR ole@tange.dk test +OK FUBAR ole@tange.dk test bug #40137: SHELL not bash: Warning when exporting funcs no_warning warning diff --git a/testsuite/wanted-results/parallel-local-ssh2 b/testsuite/wanted-results/parallel-local-ssh2 index 7522061e..6f8945fc 100644 --- a/testsuite/wanted-results/parallel-local-ssh2 +++ b/testsuite/wanted-results/parallel-local-ssh2 @@ -1,12 +1,14 @@ ### --filter-hosts --slf <() OK -### --wd no-such-dir -mkdir: cannot create directory ‘/no-such-dir’: Permission denied -bash: line 0: cd: /no-such-dir: No such file or directory -Exit code 1 -mkdir: cannot create directory ‘/no-such-dir’: Permission denied -bash: line 0: cd: /no-such-dir: No such file or directory -Exit code 1 +### --wd no-such-dir - csh +mkdir: cannot create directory ‘/no-such-dir’: Permission denied +/no-such-dir: No such file or directory. +Exit code 1 +### --wd no-such-dir - tcsh +mkdir: cannot create directory ‘/no-such-dir’: Permission denied +/no-such-dir: No such file or directory. +Exit code 1 +### --wd no-such-dir - bash mkdir: cannot create directory ‘/no-such-dir’: Permission denied bash: line 0: cd: /no-such-dir: No such file or directory Exit code 1 diff --git a/testsuite/wanted-results/parallel-local152 b/testsuite/wanted-results/parallel-local152 index 95432214..73337630 100644 --- a/testsuite/wanted-results/parallel-local152 +++ b/testsuite/wanted-results/parallel-local152 @@ -15,4 +15,20 @@ parallel: Error: -W has been retired. Use --wd. parallel: Error: -Y has been retired. Use --shebang. parallel: Error: -H has been retired. Use --halt. parallel: Error: --tollef has been retired. Use -u -q --arg-sep -- and --load for -l. +parallel: Error: -g has been retired. Use --group. +parallel: Error: -B has been retired. Use --bf. +parallel: Error: -T has been retired. Use --tty. +parallel: Error: -U has been retired. Use --er. +parallel: Error: -W has been retired. Use --wd. +parallel: Error: -Y has been retired. Use --shebang. +parallel: Error: -H has been retired. Use --halt. +parallel: Error: --tollef has been retired. Use -u -q --arg-sep -- and --load for -l. +parallel: Error: -g has been retired. Use --group. +parallel: Error: -B has been retired. Use --bf. +parallel: Error: -T has been retired. Use --tty. +parallel: Error: -U has been retired. Use --er. +parallel: Error: -W has been retired. Use --wd. +parallel: Error: -Y has been retired. Use --shebang. +parallel: Error: -H has been retired. Use --halt. +parallel: Error: --tollef has been retired. Use -u -q --arg-sep -- and --load for -l. <<< End test global config - must run alone so the global config does not confuse others diff --git a/testsuite/wanted-results/parallel-local18 b/testsuite/wanted-results/parallel-local18 index d05769ba..101a1b10 100644 --- a/testsuite/wanted-results/parallel-local18 +++ b/testsuite/wanted-results/parallel-local18 @@ -3,31 +3,26 @@ a 2 spaces b 1 a 2 spaces b 1 a 2 spaces b 1 a 2 spaces b 1 -MANPATH: Undefined variable. a 2 spaces b 1 a 2 spaces b a > My brother's 12" records < b 2 a 2 spaces b a > My brother's 12" records < b 2 a 2 spaces b a > My brother's 12" records < b 2 a 2 spaces b a > My brother's 12" records < b 2 -MANPATH: Undefined variable. a 2 spaces b a > My brother's 12" records < b 2 a 2 spaces b a > My brother's 12" records < b 3 a 2 spaces b a > My brother's 12" records < b 3 a 2 spaces b a > My brother's 12" records < b 3 a 2 spaces b a > My brother's 12" records < b 3 -MANPATH: Undefined variable. a 2 spaces b a > My brother's 12" records < b 3 a \'"b 4 a \'"b 4 a \'"b 4 a \'"b 4 -MANPATH: Undefined variable. a \'"b 4 a' * ? >o o o o o o