diff --git a/Makefile.am b/Makefile.am index 458742db..c3029891 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,8 +55,8 @@ upload: gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-$(YYYYMMDD).tar.bz2.sig # "|| true" needed if already uploaded - p=`echo parallel-latest.tar.bz2*{,.sig,.asc}`; lftp -e "put $$p; bye" ftp://ftp-upload.gnu.org/incoming/ftp/ || true - p=`echo parallel-$(YYYYMMDD).tar.bz2*{,.sig,.asc}`; lftp -e "put $$p; bye" ftp://ftp-upload.gnu.org/incoming/ftp/ || true + p=`echo parallel-latest.tar.bz2*{,.sig,.asc}`; lftp -e "put $$p; bye" ftp://anonymous@ftp-upload.gnu.org/incoming/ftp/ || true + p=`echo parallel-$(YYYYMMDD).tar.bz2*{,.sig,.asc}`; lftp -e "put $$p; bye" ftp://anonymous@ftp-upload.gnu.org/incoming/ftp/ || true # This can take 7 minutes pushd /tmp; \ diff --git a/Makefile.in b/Makefile.in index 17b6c677..1eed4de6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -824,8 +824,8 @@ upload: gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-$(YYYYMMDD).tar.bz2.sig # "|| true" needed if already uploaded - p=`echo parallel-latest.tar.bz2*{,.sig,.asc}`; lftp -e "put $$p; bye" ftp://ftp-upload.gnu.org/incoming/ftp/ || true - p=`echo parallel-$(YYYYMMDD).tar.bz2*{,.sig,.asc}`; lftp -e "put $$p; bye" ftp://ftp-upload.gnu.org/incoming/ftp/ || true + p=`echo parallel-latest.tar.bz2*{,.sig,.asc}`; lftp -e "put $$p; bye" ftp://anonymous@ftp-upload.gnu.org/incoming/ftp/ || true + p=`echo parallel-$(YYYYMMDD).tar.bz2*{,.sig,.asc}`; lftp -e "put $$p; bye" ftp://anonymous@ftp-upload.gnu.org/incoming/ftp/ || true # This can take 7 minutes pushd /tmp; \ diff --git a/NEWS b/NEWS index efaa3a21..ba60c6c9 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,21 @@ +20240322 + +New in this release: + +* Polarhome.com is down for good. This means that only platforms that + can be run in Vagrant 2.3.7 on x86-64 will be supported going + forward. + +* Bug fixes and man page updates. + + +20240222 + +New in this release: + +* Bug fixes and man page updates. + + 20240122 New in this release: diff --git a/README b/README index e71f78ae..b5d753e2 100644 --- a/README +++ b/README @@ -57,11 +57,11 @@ document. Full installation of GNU Parallel is as simple as: - wget https://ftpmirror.gnu.org/parallel/parallel-20240122.tar.bz2 - wget https://ftpmirror.gnu.org/parallel/parallel-20240122.tar.bz2.sig - gpg parallel-20240122.tar.bz2.sig - bzip2 -dc parallel-20240122.tar.bz2 | tar xvf - - cd parallel-20240122 + wget https://ftpmirror.gnu.org/parallel/parallel-20240322.tar.bz2 + wget https://ftpmirror.gnu.org/parallel/parallel-20240322.tar.bz2.sig + gpg parallel-20240322.tar.bz2.sig + bzip2 -dc parallel-20240322.tar.bz2 | tar xvf - + cd parallel-20240322 ./configure && make && sudo make install @@ -70,11 +70,11 @@ Full installation of GNU Parallel is as simple as: If you are not root you can add ~/bin to your path and install in ~/bin and ~/share: - wget https://ftpmirror.gnu.org/parallel/parallel-20240122.tar.bz2 - wget https://ftpmirror.gnu.org/parallel/parallel-20240122.tar.bz2.sig - gpg parallel-20240122.tar.bz2.sig - bzip2 -dc parallel-20240122.tar.bz2 | tar xvf - - cd parallel-20240122 + wget https://ftpmirror.gnu.org/parallel/parallel-20240322.tar.bz2 + wget https://ftpmirror.gnu.org/parallel/parallel-20240322.tar.bz2.sig + gpg parallel-20240322.tar.bz2.sig + bzip2 -dc parallel-20240322.tar.bz2 | tar xvf - + cd parallel-20240322 ./configure --prefix=$HOME && make && make install Or if your system lacks 'make' you can simply copy src/parallel @@ -122,8 +122,8 @@ will love you for it. When using programs that use GNU Parallel to process data for publication please cite: - Tange, O. (2024, January 22). GNU Parallel 20240122 ('Frederik X'). - Zenodo. https://doi.org/10.5281/zenodo.10558745 + Tange, O. (2024, March 22). GNU Parallel 20240322 ('Sweden'). + Zenodo. https://doi.org/10.5281/zenodo.10901541 Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. diff --git a/configure b/configure index 89e93f54..286621c2 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for parallel 20240222. +# Generated by GNU Autoconf 2.71 for parallel 20240322. # # Report bugs to . # @@ -610,8 +610,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='parallel' PACKAGE_TARNAME='parallel' -PACKAGE_VERSION='20240222' -PACKAGE_STRING='parallel 20240222' +PACKAGE_VERSION='20240322' +PACKAGE_STRING='parallel 20240322' PACKAGE_BUGREPORT='bug-parallel@gnu.org' PACKAGE_URL='' @@ -1246,7 +1246,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures parallel 20240222 to adapt to many kinds of systems. +\`configure' configures parallel 20240322 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1313,7 +1313,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of parallel 20240222:";; + short | recursive ) echo "Configuration of parallel 20240322:";; esac cat <<\_ACEOF @@ -1390,7 +1390,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -parallel configure 20240222 +parallel configure 20240322 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1427,7 +1427,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by parallel $as_me 20240222, which was +It was created by parallel $as_me 20240322, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2379,7 +2379,7 @@ fi # Define the identity of the package. PACKAGE='parallel' - VERSION='20240222' + VERSION='20240322' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -3026,7 +3026,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by parallel $as_me 20240222, which was +This file was extended by parallel $as_me 20240322, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3090,7 +3090,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -parallel config.status 20240222 +parallel config.status 20240322 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index db92974b..45a84949 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([parallel],[20240122],[bug-parallel@gnu.org]) +AC_INIT([parallel],[20240322],[bug-parallel@gnu.org]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([ diff --git a/doc/haikus b/doc/haikus index 694f589f..cdcf1e52 100644 --- a/doc/haikus +++ b/doc/haikus @@ -5,8 +5,6 @@ Quote of the month: - GNU parallel ftw - -- hostux.social/@rmpr @_paulmairo@twitter --line-buffer, a flag parallel, now more precise @@ -228,6 +226,9 @@ https://negfeedback.blogspot.com/2020/05/indispensable-command-line-tools.html === Used === + GNU parallel ftw + -- hostux.social/@rmpr @_paulmairo@twitter + Stop paralyzing start parallelizing -- @harshgandhi100@YouTube diff --git a/packager/obs/home-tange/parallel/.osc/_files b/packager/obs/home-tange/parallel/.osc/_files index 1c74ee0a..9fef7dfb 100644 --- a/packager/obs/home-tange/parallel/.osc/_files +++ b/packager/obs/home-tange/parallel/.osc/_files @@ -1,7 +1,8 @@ - + - - - - + + + + + diff --git a/packager/obs/home-tange/parallel/.osc/parallel.spec b/packager/obs/home-tange/parallel/.osc/parallel.spec index 80debbd9..0afd22a6 100644 --- a/packager/obs/home-tange/parallel/.osc/parallel.spec +++ b/packager/obs/home-tange/parallel/.osc/parallel.spec @@ -1,7 +1,7 @@ Summary: Shell tool for executing jobs in parallel Name: parallel -Version: 20240222 +Version: 20240322 Release: 2.1 License: GPL-3.0-or-later Group: Productivity/File utilities diff --git a/src/env_parallel.ash b/src/env_parallel.ash index f45ff15c..c0892671 100755 --- a/src/env_parallel.ash +++ b/src/env_parallel.ash @@ -601,7 +601,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240122 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240322 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.bash b/src/env_parallel.bash index b56d6310..bd5d4ce3 100755 --- a/src/env_parallel.bash +++ b/src/env_parallel.bash @@ -605,7 +605,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240122 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240322 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.dash b/src/env_parallel.dash index 89ca1081..0b729389 100755 --- a/src/env_parallel.dash +++ b/src/env_parallel.dash @@ -601,7 +601,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240122 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240322 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.ksh b/src/env_parallel.ksh index 2b5e4ee4..b37c3547 100755 --- a/src/env_parallel.ksh +++ b/src/env_parallel.ksh @@ -601,7 +601,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240122 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240322 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.mksh b/src/env_parallel.mksh index dfcc7686..f1144fd2 100644 --- a/src/env_parallel.mksh +++ b/src/env_parallel.mksh @@ -570,7 +570,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240122 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240322 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.sh b/src/env_parallel.sh index d8542468..f205348c 100755 --- a/src/env_parallel.sh +++ b/src/env_parallel.sh @@ -601,7 +601,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240122 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240322 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.zsh b/src/env_parallel.zsh index 574ad366..d807f45c 100755 --- a/src/env_parallel.zsh +++ b/src/env_parallel.zsh @@ -601,7 +601,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240122 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240322 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/niceload b/src/niceload index 78547c5f..ae31f859 100755 --- a/src/niceload +++ b/src/niceload @@ -26,7 +26,7 @@ use strict; use Getopt::Long; $Global::progname="niceload"; -$Global::version = 20240122; +$Global::version = 20240322; Getopt::Long::Configure("bundling","require_order"); get_options_from_array(\@ARGV) || die_usage(); if($opt::version) { diff --git a/src/parallel b/src/parallel index eaba3d6d..a388e746 100755 --- a/src/parallel +++ b/src/parallel @@ -2794,7 +2794,7 @@ sub check_invalid_option_combinations() { sub init_globals() { # Defaults: - $Global::version = 20240122; + $Global::version = 20240322; $Global::progname = 'parallel'; $::name = "GNU Parallel"; $Global::infinity = 2**31; @@ -5842,8 +5842,8 @@ sub usage() { "If you use programs that use GNU Parallel to process data for an article in a", "scientific publication, please cite:", "", - " Tange, O. (2024, January 22). GNU Parallel 20240122 ('Frederik X').", - " Zenodo. https://doi.org/10.5281/zenodo.10558745", + " Tange, O. (2024, March 22). GNU Parallel 20240322 ('Sweden').", + " Zenodo. https://doi.org/10.5281/zenodo.10901541", "", # Before changing these lines, please read # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice @@ -5875,8 +5875,8 @@ sub citation_notice() { "If you use programs that use GNU Parallel to process data for an article in a", "scientific publication, please cite:", "", - " Tange, O. (2024, January 22). GNU Parallel 20240122 ('Frederik X').", - " Zenodo. https://doi.org/10.5281/zenodo.10558745", + " Tange, O. (2024, March 22). GNU Parallel 20240322 ('Sweden').", + " Zenodo. https://doi.org/10.5281/zenodo.10901541", "", # Before changing these line, please read # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice and @@ -6003,20 +6003,20 @@ sub citation() { "If you use programs that use GNU Parallel to process data for an article in a", "scientific publication, please cite:", "", - "\@software{tange_2024_10558745,", + "\@software{tange_2024_10901541,", " author = {Tange, Ole},", - " title = {GNU Parallel 20240122 ('Frederik X')},", - " month = Jan,", + " title = {GNU Parallel 20240322 ('Sweden')},", + " month = Mar,", " year = 2023,", " note = {{GNU Parallel is a general parallelizer to run", " multiple serial command line programs in parallel", " without changing them.}},", " publisher = {Zenodo},", - " doi = {10.5281/zenodo.10558745},", - " url = {https://doi.org/10.5281/zenodo.10558745}", + " doi = {10.5281/zenodo.10901541},", + " url = {https://doi.org/10.5281/zenodo.10901541}", "}", "", - "(Feel free to use \\nocite{tange_2024_10558745})", + "(Feel free to use \\nocite{tange_2024_10901541})", "", # Before changing these lines, please read # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice and diff --git a/src/parallel.pod b/src/parallel.pod index 08ded716..3c51b53a 100644 --- a/src/parallel.pod +++ b/src/parallel.pod @@ -841,9 +841,9 @@ https://perldoc.perl.org/perlre.html See also: B<--csv> B<{>IB<}> B<--trim> B<--link> -=item B<--combineexec> I (beta testing) +=item B<--combineexec> I -=item B<--combine-executable> I (beta testing) +=item B<--combine-executable> I Combine GNU B with another program into a single executable. diff --git a/src/parsort b/src/parsort index 1f32d43b..b5b69014 100755 --- a/src/parsort +++ b/src/parsort @@ -137,7 +137,7 @@ GetOptions( "help" => \$opt::dummy, ) || exit(255); $Global::progname = ($0 =~ m:(^|/)([^/]+)$:)[1]; -$Global::version = 20240122; +$Global::version = 20240322; if($opt::version) { version(); exit 0; } # Remove -D and --parallel=N my @s = (grep { ! /^-D$|^--parallel=\S+$/ } diff --git a/src/sql b/src/sql index 7871d822..a6a306ae 100755 --- a/src/sql +++ b/src/sql @@ -670,7 +670,7 @@ $Global::Initfile && unlink $Global::Initfile; exit ($err); sub parse_options { - $Global::version = 20240122; + $Global::version = 20240322; $Global::progname = 'sql'; # This must be done first as this may exec myself diff --git a/testsuite/tests-to-run/parallel-local-0.3s.sh b/testsuite/tests-to-run/parallel-local-0.3s.sh index f20f39d7..19e24548 100644 --- a/testsuite/tests-to-run/parallel-local-0.3s.sh +++ b/testsuite/tests-to-run/parallel-local-0.3s.sh @@ -93,8 +93,10 @@ par_shellcompletion() { par_ctagstring() { echo '### --ctag --ctagstring should be different from --tag --tagstring' + echo tag/ctag 8 37 parallel --tag echo ::: 1 ::: a| wc -c parallel --ctag echo ::: 1 ::: a | wc -c + echo tagstring/ctagstring 10 39 parallel --tagstring 'I{1}\tB{2}' echo ::: 1 ::: a | wc -c parallel --ctagstring 'I{1}\tB{2}' echo ::: 1 ::: a | wc -c } diff --git a/testsuite/tests-to-run/parallel-local-3s.sh b/testsuite/tests-to-run/parallel-local-3s.sh index 68050fe1..7f6654cc 100644 --- a/testsuite/tests-to-run/parallel-local-3s.sh +++ b/testsuite/tests-to-run/parallel-local-3s.sh @@ -15,9 +15,235 @@ par__test_cpu_detection_topology() { export -f unpack # ssh s "(cd /sys/devices/system/cpu; tar c cpu*/topology)" | pack | repack # repack due to: File shrank by 4093 bytes; padding with zeros - + cpu12() { + echo '4-64-64-64 Dell R815 4 CPU 64-core' + echo ' + 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 + 4R8QHVIPwAOo4b4aVRBQC1j7DAHI8Cxu + ' + } + cpu13() { + echo '1-2-2-2 AMD Neo N36L Dual-Core Processor' + echo ' + KLUv/QRorAkAMs0iHIAlzhiAkTYNfqzdobWLDMy5tCJ7i2xpEFTDbgp3bpGkmoGWh4pzHlmY + R1MPXf4/sgy1EIQS/39mqCQRHIkZAAPuhvG02DPzv7GlGCwhLEVgMUM1y3FoT4GJe3RViYJk + URZmaYkO1524AnMQg////////1cJIbWHoUmNFf7/dRjxKF6RuC5+t/fEIDegkaVSlojYaq01 + wSkxioQigQS2B/0JO/7LN5lUPSDb1BV4wjMXb7cyPbAEN6DjxQDssWyAIBWbJgMaFG6AAcv1 + QjaAIDUfIHA6IH8xF2OHByyd+lccVwCGgP2QUe9F0gdEkfM/QK6PY76agN1zBpPkAAbkICz+ + 226CXSoHmLRCOklzqQPgeLWT1ajVgsQHkFMnDGU/ymqOiRLADtiBNmNoAAD2ZOgBNAYAFAI3 + NTc2NHBoeXNpY2FsX2lkNjYwNTQ2NjAxNTExMTExMTEvoGBv6wahpfBDRIDcA/0PINQnGyBQ + AZESgPtkAwjUISkB8HdlA9BUIKkCYD3ZgKgCghIA98kGKKQKSRWAjz3ZAKIqhKhpA9KqQaaM + FnXIgDNSBWAAdV9kAxqo75QAFpwEDHi2B7JV9QOyKcCiDtfSxQAE7w1YWmLNSRjQRjSAuuv/ + AAL+kw1oXFXOTMBI1ABCkv4HkPswJvUGPJ1OutlfvWACzQIAQDE1MTE2MjExF+DwKn6HuAP9 + CXz/B1D0lQ0YVu2BIgDUIxtgpAJBDQD2ZgM2SFUA1AZ4gLCdbECj6pFqALo32YAJqz+iL9t/ + A2TvyAbYWB2CElp8ByKiPSxNKA7N + ' + } cpu18() { - echo '1-4-8-4 Lenovo E540 i7-4712MQ' + echo '1-4-8-4 Lenovo E540 i7-4712MQ (PROSA stud organizer)' echo ' KLUv/QRoHAsAMk0mHWC1cQMAQXg43q4Vap89AAAg2t0lEnmtAQSEjEgBuozI2UgR9pHWQngK UfLvBgNkXYcUWANgzlhLksiMpACVFKMlxdyBoBzuH4wVNf////+DNYGsu9jxACIOmi8qcyr2 @@ -57,6 +283,32 @@ par__test_cpu_detection_topology() { 2w== ' } + cpu19() { + echo '1-2-4-2 ThinkPad A475 AMD PRO A12-8830B R7 (64g)' + echo ' + KLUv/QRojAoAEk4kHHAlTgfA8cgfWfe8Fj0M/f/7TWS7cdsEWHW6DymHMJ1SXava1RxpCPG/ + 2Dx1+P8/0grWkIFE9M8Sg+AwGLRSFQ1TBlABd8O9rkTE/8dpSuEkhKYINKdgzXKkypRJLVxr + tURBsigLszx3k7gCcxCD////////ZwnBeB6Gxnicwv//3+GiGw81Fd1CdBN9lzcxCECgga2y + akRhuaY14SUhIqFIMMHZAfsHO5RB3Qd8NDHA/GIA7K9swCKVQfAAqAgwJgSo4Q14+qTg/0D0 + gywqmZIDGt4NAL3IBvSq+s1kQLa3BXgAgXbMBixUSNad/FfMhwA9ZNVMeWpAjpz/AbL9HgNU + DKzXcTgC2irA95dZJQfkSgjIkEsOAIoYwAPyPgP8l/cAA9QOIPna8ZLOVQ2A4d82TY2qAlgW + 8h/QBDGghg9zmU3fAPdnSIAB+nTkAVwGAFQDMzN0aHJlYWQ3MDI0NjAwM2NvcjY0cGh5c2lj + YWxfaWQ2NjEyNTQ3MQA2MDIyMjQxMjI0MDIq4FGl8DMCo70D/AE8kg2YSN2BQgBuRzaAnSqI + VKJRf0wRzaohA2RDFYABFP2SDWhQRSs1YMnLAQaE6XUMqL0BORVgCRXUAAOM72tMVQMsjzSw + FBj0fm2ABwjbjWzAMpVyjglgR22AAYJ9jKGiAwgnbUBuZwEeEL5nWdTaAKGpUEBDZBH9D9CQ + j2SrutMDFu4GxMNYJAMAgDI1MjQyNjIyNjI1MjIyYzIbqNA+QC8/SnIMEP7//5+m4sYB/d+A + MMgKBAMgWNkAJHngABg0G1DvAwaATQYeFACTrB4TAJhsQC8hkgB8IBuw4MECYEQ2IOcDSIsB + hjyOgCM9CMwDAFgyMjIzMzMzMzMzMyLosbn4maiGDxH8//8/WQ3dDv2HlQ2Aw2MLgBDZgCwk + CQBFNoAJEFoANsgGlDhEaGrxAEZ4UKgNmO3RaB0yVQAGUA5kAxqFMAGoyAb0CwQFwCIbAKoM + Ug0w47IBnKpA1AADBJKyAQXpEQuAFJc8AwBQMzIzMzMzNDMzMxzoQCf/zOYBEBrh//9/VgaR + hQP9AZQN4CEeDoAxswE/lgOMLQZ4PR+qafEAuIaQAOzIBlB+OAF4TDYgnYTc7d3/ABbMbMCD + OFAAXMgGLIKQAnCQDejZI4T+Qz4V1AMAeDMzMTExMTM3MTExMTExMSa8UH1kPcAAAVIs0P8A + FnSzAXOFAwIAlw0wPR8kAAcyFpIA7FU2gJr4kAAgygZw3IcEYDIbcHA6igXgARYlmGwAsUML + wNOyAZ/yoUptwEX5A6s2YGx/XADMsgFZ70MCcCIbsGsJ0QloLBxNAgA4MTExMTExMRXsAGny + O8kO/ZH1/ysbgDt4GNNigLcdQgEQzQa8sY8KgJHZgNEEH5ZaDBAmPAoAjGYDYMQQIgAH2QDK + QESAkg8EKmp0oA== + ' + } export -f $(compgen -A function | grep ^cpu) test_one() { @@ -397,7 +649,7 @@ par__test_cpu_detection_cpuinfo() { ' | unpack } cpu18() { - echo '1-4-8-4 Lenovo E540 i7-4712MQ' + echo '1-4-8-4 Lenovo E540 i7-4712MQ (PROSA stud organizer)' echo ' KLUv/QRobR0A5ricJCBPrAOD/6k2Kdd940OW+jV8IowHH1LHEyOAj3wFiBJCBBssApkAhwCK APGt67f5676ReksM8kXiMHCphXdPzld5W7WrF2Pi6JC9+uRrj1nyLJ0tyQeh1+4dsvYaI8IJ @@ -673,7 +925,7 @@ par__test_cpu_detection_lscpu() { ' | unpack } cpu18() { - echo '1-4-8-4 Lenovo E540 i7-4712MQ' + echo '1-4-8-4 Lenovo E540 i7-4712MQ (PROSA stud organizer)' echo ' KLUv/QRoRSMA+kY8DCrgjmpz6GpWtLK0DL5oW2iXhXfvoPKn9A8udDwya4/7NeYGAKcJM8QO GxzLAKcAsQDs+6hPMmJJHYLGCeAgIBLgYYmgVKIUJxHYGA4MhkNSoaDySp9Dgk3KbUvjWJpH diff --git a/testsuite/tests-to-run/parallel-local-ssh5.sh b/testsuite/tests-to-run/parallel-local-ssh5.sh index 3f605907..c2960848 100644 --- a/testsuite/tests-to-run/parallel-local-ssh5.sh +++ b/testsuite/tests-to-run/parallel-local-ssh5.sh @@ -147,7 +147,7 @@ par__--shellquote_command_len() { export -f outer stdout parallel --tag -k outer ::: '-Slo -j10' '' | - perl -pe 's/(\d\d+)\d\d\d/${1}xxx/g'; + perl -pe 's/(\d+)\d\d\d\d/${1}xxxx/g'; } export -f $(compgen -A function | grep par_) diff --git a/testsuite/tests-to-run/parallel-local-ssh7.sh b/testsuite/tests-to-run/parallel-local-ssh7.sh index a5833c2a..96ca066e 100755 --- a/testsuite/tests-to-run/parallel-local-ssh7.sh +++ b/testsuite/tests-to-run/parallel-local-ssh7.sh @@ -2087,47 +2087,70 @@ par_environment_too_big_tcsh() { par_environment_too_big_zsh() { myscript=$(cat <<'_EOF' echo 'bug #50815: env_parallel should warn if the environment is too big' + + # Zsh's default env is often too big. Remove all _* functions. + print -l ${(k)functions}|grep ^_ | while read a; do unset -f "$a"; done + . `which env_parallel.zsh`; - bigvar="$(perl -e 'print "x"x24000')" + len_var=16 + len_var_remote=$len_var-15 + len_var_quote=$len_var + len_var_quote_remote=$len_var-15 + len_fun=18 + len_fun_remote=$len_fun-10 + len_fun_quote=$len_fun + len_fun_quote_remote=$len_fun-10 + + repeat_() { + # Repeat input string n*1000 times + perl -e 'print ((shift)x(eval "1000*(".shift.")"))' "$@" + } + + bigvar=$(repeat_ x $len_var) env_parallel echo ::: OK_bigvar - bigvar="$(perl -e 'print "x"x12000')" + bigvar=$(repeat_ x $len_var_remote) env_parallel -S lo echo ::: OK_bigvar_remote - bigvar="$(perl -e 'print "\""x24000')" + bigvar=$(repeat_ \" $len_var_quote) env_parallel echo ::: OK_bigvar_quote - bigvar="$(perl -e 'print "\""x12000')" + bigvar=$(repeat_ \" $len_var_quote_remote) env_parallel -S lo echo ::: OK_bigvar_quote_remote bigvar=u - eval 'bigfunc() { a="'"$(perl -e 'print "x"x24000')"'"; };' + eval 'bigfunc() { a="'"$(repeat_ x $len_fun)"'"; };' env_parallel echo ::: OK_bigfunc - eval 'bigfunc() { a="'"$(perl -e 'print "x"x12000')"'"; };' + eval 'bigfunc() { a="'"$(repeat_ x $len_fun_remote)"'"; };' env_parallel -S lo echo ::: OK_bigfunc_remote - eval 'bigfunc() { a="'"$(perl -e 'print "\""x24000')"'"; };' + eval 'bigfunc() { a="'"$(repeat_ \" $len_fun_quote)"'"; };' env_parallel echo ::: OK_bigfunc_quote - eval 'bigfunc() { a="'"$(perl -e 'print "\""x12000')"'"; };' + eval 'bigfunc() { a="'"$(repeat_ \" $len_fun_quote_remote)"'"; };' env_parallel -S lo echo ::: OK_bigfunc_quote_remote bigfunc() { true; } echo Rest should fail - bigvar="$(perl -e 'print "x"x126000')" + # Add 10 or 100. It differs a bit from system to system + bigvar=$(repeat_ x $len_var+20) env_parallel echo ::: fail_bigvar + bigvar=$(repeat_ x $len_var_remote+10) env_parallel -S lo echo ::: fail_bigvar_remote - bigvar="$(perl -e 'print "\""x127000')" + bigvar=$(repeat_ \" $len_var_quote+20) env_parallel echo ::: fail_bigvar_quote + bigvar=$(repeat_ \" $len_var_quote_remote+20) env_parallel -S lo echo ::: fail_bigvar_quote_remote bigvar=u - eval 'bigfunc() { a="'"$(perl -e 'print "x"x128000')"'"; };' + eval 'bigfunc() { a="'"$(repeat_ x $len_fun+20)"'"; };' env_parallel echo ::: fail_bigfunc + eval 'bigfunc() { a="'"$(repeat_ x $len_fun_remote+20)"'"; };' env_parallel -S lo echo ::: fail_bigfunc_remote - eval 'bigfunc() { a="'"$(perl -e 'print "\""x129000')"'"; };' + eval 'bigfunc() { a="'"$(repeat_ \" $len_fun_quote+20)"'"; };' env_parallel echo ::: fail_bigfunc_quote + eval 'bigfunc() { a="'"$(repeat_ \" $len_fun_quote_remote+10)"'"; };' env_parallel -S lo echo ::: fail_bigfunc_quote_remote bigfunc() { true; } diff --git a/testsuite/tests-to-run/parallel-macos.sh b/testsuite/tests-to-run/parallel-macos.sh index 4ec95689..80a511b7 100644 --- a/testsuite/tests-to-run/parallel-macos.sh +++ b/testsuite/tests-to-run/parallel-macos.sh @@ -4,6 +4,11 @@ # # SPDX-License-Identifier: GPL-3.0-or-later +# Clean up environment to make room for the test functions +while read f ; do + eval unset -f "$f"; +done < <(compgen -A function | grep ^_) + . `which env_parallel.bash` env_parallel --session @@ -70,6 +75,7 @@ par_many_args() { for a in `seq 6000`; do eval "export a$a=1" ; done geny 10000 | stdout parallel -Xkj1 'pecho {} {} {} {} | wc' | perl -pe 's/( y){10,}//g' + echo } par_many_var() { @@ -81,7 +87,8 @@ par_many_var() { for a in `seq 6000`; do eval "export a$a=1" ; done gen 40000 | stdout parallel -Xkj1 'pecho {} {} {} {} | wc -c' | perl -pe 's/\d{10,}.\d+ //g; s/(\d+)\d\d\d/${1}XXX/g;' | - grep 22XXX + grep XXX + echo } par_many_var_func() { @@ -96,6 +103,7 @@ par_many_var_func() { for a in `seq 2000`; do eval export -f a$a ; done gen 40000 | stdout parallel -Xkj1 'pecho {} {} {} {} | wc' | perl -pe 's/\d{10,}.\d+ //g' + echo } par_many_func() { @@ -105,10 +113,12 @@ par_many_func() { gen() { seq -f %f 1000000000000000 1000000000050000 | head -c $1; } pecho() { perl -e 'print "@ARGV\n"' "$@"; } export -f pecho - for a in `seq 5000`; do eval "a$a() { 1; }" ; done - for a in `seq 5000`; do eval export -f a$a ; done - gen 40000 | stdout parallel -Xkj1 'pecho {} {} {} {} | wc' | + for a in `seq 3000`; do eval "a$a() { 1; }" ; done + for a in `seq 3000`; do eval export -f a$a ; done + gen 40000 | stdout parallel -Xkj1 'pecho {} {} {} {} | wc' + echo | perl -pe 's/\d{10,}.\d+ //g' + echo } par_big_func() { @@ -123,6 +133,7 @@ par_big_func() { for a in `seq 1`; do eval export -f a$a ; done gen 80000 | stdout parallel --load 2 -Xkj1 'pecho {} {} {} {} | wc' | perl -pe 's/\d{10,}.\d+ //g' + echo } par_many_var_big_func() { @@ -138,6 +149,7 @@ par_many_var_big_func() { gen 40000 | stdout parallel -Xkj1 'pecho {} {} {} {} | wc -c' | perl -pe 's/\d{10,}.\d+ //g; s/(\d+)\d\d\d/${1}XXX/g;' | grep 5XXX + echo } par_big_func_name() { @@ -150,7 +162,8 @@ par_big_func_name() { for a in `seq 10`; do eval "export a$big$a=1" ; done gen 30000 | stdout parallel -Xkj1 'pecho {} {} {} {} | wc -c' | perl -pe 's/\d{10,}.\d+ //g; s/(\d+)\d\d\d/${1}XXX/g;' | - grep 18XXX + grep 1.XXX + echo } par_big_var_func_name() { @@ -159,13 +172,14 @@ par_big_var_func_name() { gen() { seq -f %f 1000000000000000 1000000000050000 | head -c $1; } pecho() { perl -e 'print "@ARGV\n"' "$@"; } export -f pecho - big=`perl -e print\"x\"x10000` + big=`perl -e print\"x\"x5000` for a in `seq 10`; do eval "export a$big$a=1" ; done for a in `seq 10`; do eval "a$big$a() { 1; }" ; done for a in `seq 10`; do eval export -f a$big$a ; done gen 80000 | stdout parallel --load 4 -Xkj1 'pecho {} {} {} {} | wc -c' | perl -pe 's/\d{10,}.\d+ //g; s/(\d+)\d\d\d/${1}XXX/g;' | - grep 18XXX + grep XXX + echo } export PARALLEL="--_unsafe" diff --git a/testsuite/tests-to-run/parallel-remote1.sh b/testsuite/tests-to-run/parallel-remote1.sh index 4d381116..e099fac5 100644 --- a/testsuite/tests-to-run/parallel-remote1.sh +++ b/testsuite/tests-to-run/parallel-remote1.sh @@ -47,14 +47,17 @@ par__filter_hosts_different_errors() { par_timeout_retries() { echo '### test --timeout --retries' + # 8.8.8.8 is up but does not allow login - should timeout + # 8.8.8.9 is down - should timeout + # 192.168.1.197 is down but on our subnet - should not timeout stdout parallel -j0 --timeout 5 --retries 3 -k ssh {} echo {} \ - ::: 192.168.1.197 8.8.8.8 $SSHLOGIN1 $SSHLOGIN2 $SSHLOGIN3 | + ::: 192.168.1.197 8.8.8.8 8.8.8.9 $SSHLOGIN1 $SSHLOGIN2 $SSHLOGIN3 | grep -v 'Warning: Permanently added' | puniq } par__filter_hosts_no_ssh_nxserver() { echo '### test --filter-hosts with server w/o ssh, non-existing server' - stdout parallel -S 192.168.1.197,8.8.8.8,$SSHLOGIN1,$SSHLOGIN2,$SSHLOGIN3 --filter-hosts --nonall -k --tag echo | + stdout parallel -S 192.168.1.197,8.8.8.8,8.8.8.9,$SSHLOGIN1,$SSHLOGIN2,$SSHLOGIN3 --filter-hosts --nonall -k --tag echo | grep -v 'parallel: Warning: Removed' } diff --git a/testsuite/tests-to-run/parallel-tutorial.sh b/testsuite/tests-to-run/parallel-tutorial.sh index 3eb6d3d7..08045083 100644 --- a/testsuite/tests-to-run/parallel-tutorial.sh +++ b/testsuite/tests-to-run/parallel-tutorial.sh @@ -59,11 +59,11 @@ perl -ne '$/="\n\n"; /^Output/../^[^O]\S/ and next; /^ / and print;' "$testsuit # Remote script s/(PARALLEL_PID\D+)\d+/${1}000000/g; # sql timing - s/,[a-z]*,\d+.\d+,\d+.\d+/,:,000000000.000,0.000/g; + s/,[a-z0-9]*,\d+.\d+,\d+.\d+/,:,000000000.000,0.000/g; # /usr/bin/time -f %e s/^(\d+)\.\d+$/$1/; # --workdir ... - s:parallel/tmp/[a-z]+-\d+-1:TMPWORKDIR:g; + s:parallel/tmp/[a-z0-9]+-\d+-1:TMPWORKDIR:g; # .../privat/parallel2/ s='$srcdir'==; # + cat ... | (Bash outputs these in random order) diff --git a/testsuite/wanted-results/parallel-local-0.3s b/testsuite/wanted-results/parallel-local-0.3s index f7e894c0..687adeb9 100644 --- a/testsuite/wanted-results/parallel-local-0.3s +++ b/testsuite/wanted-results/parallel-local-0.3s @@ -64,34 +64,34 @@ par_bug43654 par_bug43654 100% 1:0=0s 1 par_colour_failed --colour-failed --colour par_colour_failed seq 1;exit 0 par_colour_failed 1 -par_colour_failed seq 1;exit 1 -par_colour_failed 1 -par_colour_failed seq 1;exit 2 -par_colour_failed 1 +par_colour_failed seq 1;exit 1(B +par_colour_failed 1(B +par_colour_failed seq 1;exit 2(B +par_colour_failed 1(B par_colour_failed seq 2;exit 0 par_colour_failed 1 par_colour_failed 2 -par_colour_failed seq 2;exit 1 -par_colour_failed 1 -par_colour_failed 2 -par_colour_failed seq 2;exit 2 -par_colour_failed 1 -par_colour_failed 2 -par_colour_failed seq 1;exit 0 -par_colour_failed 1 -par_colour_failed seq 1;exit 1 -par_colour_failed 1 -par_colour_failed seq 1;exit 2 -par_colour_failed 1 -par_colour_failed seq 2;exit 0 -par_colour_failed 1 -par_colour_failed 2 -par_colour_failed seq 2;exit 1 -par_colour_failed 1 -par_colour_failed 2 -par_colour_failed seq 2;exit 2 -par_colour_failed 1 -par_colour_failed 2 +par_colour_failed seq 2;exit 1(B +par_colour_failed 1(B +par_colour_failed 2(B +par_colour_failed seq 2;exit 2(B +par_colour_failed 1(B +par_colour_failed 2(B +par_colour_failed seq 1;exit 0(B +par_colour_failed 1(B +par_colour_failed seq 1;exit 1(B +par_colour_failed 1(B +par_colour_failed seq 1;exit 2(B +par_colour_failed 1(B +par_colour_failed seq 2;exit 0(B +par_colour_failed 1(B +par_colour_failed 2(B +par_colour_failed seq 2;exit 1(B +par_colour_failed 1(B +par_colour_failed 2(B +par_colour_failed seq 2;exit 2(B +par_colour_failed 1(B +par_colour_failed 2(B par_colsep_0 bug --colsep 0 par_colsep_0 OK par_colsep_0 OK @@ -144,10 +144,12 @@ par_csv_pipe More records in single block par_csv_pipe 9000" par_csv_pipe 11000" par_ctagstring ### --ctag --ctagstring should be different from --tag --tagstring +par_ctagstring tag/ctag 8 37 par_ctagstring 8 -par_ctagstring 35 -par_ctagstring 10 par_ctagstring 37 +par_ctagstring tagstring/ctagstring 10 39 +par_ctagstring 10 +par_ctagstring 39 par_delimiter ### Test --delimiter and -d: Delimiter instead of newline par_delimiter # Yes there is supposed to be an extra newline for -d N par_delimiter This is line 1 @@ -332,8 +334,8 @@ par_link_files_as_only_arg 1 1 1 par_link_files_as_only_arg 2 2 2 par_link_files_as_only_arg 3 3 3 par_ll_long_followed_by_short par_ll_long_followed_by_short A very long line -par_ll_long_followed_by_short M par_ll_long_followed_by_short A very long line -par_ll_long_followed_by_short M par_ll_long_followed_by_short OK +par_ll_long_followed_by_short  par_ll_long_followed_by_short A very long line +par_ll_long_followed_by_short  par_ll_long_followed_by_short OK par_ll_no_newline bug #64030: parallel --ll echo -n ::: foo par_ll_no_newline par_ll_no_newline lines par_ll_no_newline par_ll_no_newline two diff --git a/testsuite/wanted-results/parallel-local-10s b/testsuite/wanted-results/parallel-local-10s index b48e6566..10eef73e 100644 --- a/testsuite/wanted-results/parallel-local-10s +++ b/testsuite/wanted-results/parallel-local-10s @@ -542,66 +542,36 @@ par_line_buffer ### --line-buffer par_line_buffer 55 55 120 par_line_buffer These must diff: 1 par_ll_color_long_line ### --latest-line --color with lines longer than terminal width -par_ll_color_long_line par_ll_color_long_line 01x 0100000 1 2 3 4 5 6 7> -par_ll_color_long_line par_ll_color_long_line 02xx 0200000 1 2 3 4 5 6 7> -par_ll_color_long_line par_ll_color_long_line 03xxx 0300000 1 2 3 4 5 6 7> -par_ll_color_long_line par_ll_color_long_line 04xxxx 0400000 1 2 3 4 5 6 7> -par_ll_color_long_line par_ll_color_long_line 05xxxxx 0500000 1 2 3 4 5 6 7> -par_ll_color_long_line par_ll_color_long_line 06xxxxxx 0600000 1 2 3> -par_ll_color_long_line par_ll_color_long_line 07xxxxxxx 0700000 1 2 3> -par_ll_color_long_line par_ll_color_long_line 08xxxxxxxx 0800000 1 2 3> -par_ll_color_long_line par_ll_color_long_line 09xxxxxxxxx 0900000 1 2 3> -par_ll_color_long_line par_ll_color_long_line 10xxxxxxxxxx 1000000 1 2 3> -par_ll_color_long_line par_ll_color_long_line 11xxxxxxxxxxx 1100000 1 2 3> -par_ll_color_long_line par_ll_color_long_line 12xxxxxxxxxxxx 1200000 1 2 3> -par_ll_color_long_line par_ll_color_long_line 13xxxxxxxxxxxxx 1300000 1 2 3> -par_ll_color_long_line par_ll_color_long_line 14xxxxxxxxxxxxxx 14000> -par_ll_color_long_line par_ll_color_long_line 15xxxxxxxxxxxxxxx 15000> -par_ll_color_long_line par_ll_color_long_line 16xxxxxxxxxxxxxxxx 16000> -par_ll_color_long_line par_ll_color_long_line 17xxxxxxxxxxxxxxxxx 17000> -par_ll_color_long_line par_ll_color_long_line 18xxxxxxxxxxxxxxxxxx 18000> -par_ll_color_long_line par_ll_color_long_line 19xxxxxxxxxxxxxxxxxxx 19000> -par_ll_color_long_line par_ll_color_long_line 20xxxxxxxxxxxxxxxxxxxx 20000> -par_ll_color_long_line par_ll_color_long_line 21xxxxxxxxxxxxxxxxxxxxx 21000> -par_ll_color_long_line par_ll_color_long_line 22xxxxxxxxxxxxxxxxxxxxxx > -par_ll_color_long_line par_ll_color_long_line 23xxxxxxxxxxxxxxxxxxxxxxx > -par_ll_color_long_line par_ll_color_long_line 24xxxxxxxxxxxxxxxxxxxxxxxx > -par_ll_color_long_line par_ll_color_long_line 25xxxxxxxxxxxxxxxxxxxxxxxxx > -par_ll_color_long_line par_ll_color_long_line 26xxxxxxxxxxxxxxxxxxxxxxxxxx > -par_ll_color_long_line par_ll_color_long_line 27xxxxxxxxxxxxxxxxxxxxxxxxxxx> -par_ll_color_long_line par_ll_color_long_line 28xxxxxxxxxxxxxxxxxxxxxxxxxxx> -par_ll_color_long_line par_ll_color_long_line 29xxxxxxxxxxxxxxxxxxxxxxxxxxx> -par_ll_color_long_line par_ll_color_long_line 30xxxxxxxxxxxxxxxxxxxxxxxxxxx> -par_ll_color_long_line M par_ll_color_long_line 01x 0100000 1 2 3 4 5 6 7> -par_ll_color_long_line M par_ll_color_long_line 02xx 0200000 1 2 3 4 5 6 7> -par_ll_color_long_line M par_ll_color_long_line 03xxx 0300000 1 2 3 4 5 6 7> -par_ll_color_long_line M par_ll_color_long_line 04xxxx 0400000 1 2 3 4 5 6 7> -par_ll_color_long_line M par_ll_color_long_line 05xxxxx 0500000 1 2 3 4 5 6 7> -par_ll_color_long_line M par_ll_color_long_line 06xxxxxx 0600000 1 2 3> -par_ll_color_long_line M par_ll_color_long_line 07xxxxxxx 0700000 1 2 3> -par_ll_color_long_line M par_ll_color_long_line 08xxxxxxxx 0800000 1 2 3> -par_ll_color_long_line M par_ll_color_long_line 09xxxxxxxxx 0900000 1 2 3> -par_ll_color_long_line M par_ll_color_long_line 10xxxxxxxxxx 1000000 1 2 3> -par_ll_color_long_line M par_ll_color_long_line 11xxxxxxxxxxx 1100000 1 2 3> -par_ll_color_long_line M par_ll_color_long_line 12xxxxxxxxxxxx 1200000 1 2 3> -par_ll_color_long_line M par_ll_color_long_line 13xxxxxxxxxxxxx 1300000 1 2 3> -par_ll_color_long_line M par_ll_color_long_line 14xxxxxxxxxxxxxx 14000> -par_ll_color_long_line M par_ll_color_long_line 15xxxxxxxxxxxxxxx 15000> -par_ll_color_long_line M par_ll_color_long_line 16xxxxxxxxxxxxxxxx 16000> -par_ll_color_long_line M par_ll_color_long_line 17xxxxxxxxxxxxxxxxx 17000> -par_ll_color_long_line M par_ll_color_long_line 18xxxxxxxxxxxxxxxxxx 18000> -par_ll_color_long_line M par_ll_color_long_line 19xxxxxxxxxxxxxxxxxxx 19000> -par_ll_color_long_line M par_ll_color_long_line 20xxxxxxxxxxxxxxxxxxxx 20000> -par_ll_color_long_line M par_ll_color_long_line 21xxxxxxxxxxxxxxxxxxxxx 21000> -par_ll_color_long_line M par_ll_color_long_line 22xxxxxxxxxxxxxxxxxxxxxx > -par_ll_color_long_line M par_ll_color_long_line 23xxxxxxxxxxxxxxxxxxxxxxx > -par_ll_color_long_line M par_ll_color_long_line 24xxxxxxxxxxxxxxxxxxxxxxxx > -par_ll_color_long_line M par_ll_color_long_line 25xxxxxxxxxxxxxxxxxxxxxxxxx > -par_ll_color_long_line M par_ll_color_long_line 26xxxxxxxxxxxxxxxxxxxxxxxxxx > -par_ll_color_long_line M par_ll_color_long_line 27xxxxxxxxxxxxxxxxxxxxxxxxxxx> -par_ll_color_long_line M par_ll_color_long_line 28xxxxxxxxxxxxxxxxxxxxxxxxxxx> -par_ll_color_long_line M par_ll_color_long_line 29xxxxxxxxxxxxxxxxxxxxxxxxxxx> -par_ll_color_long_line M par_ll_color_long_line 30xxxxxxxxxxxxxxxxxxxxxxxxxxx> +par_ll_color_long_line par_ll_color_long_line 01x 0100000 1 2 3 4 5 6 7>(B +par_ll_color_long_line par_ll_color_long_line 02xx 0200000 1 2 3 4 5 6 7>(B +par_ll_color_long_line par_ll_color_long_line 03xxx 0300000 1 2 3 4 5 6 7>(B +par_ll_color_long_line par_ll_color_long_line 04xxxx 0400000 1 2 3 4 5 6 7>(B +par_ll_color_long_line par_ll_color_long_line 05xxxxx 0500000 1 2 3 4 5 6 7>(B +par_ll_color_long_line par_ll_color_long_line 06xxxxxx 0600000 1 2 3>(B +par_ll_color_long_line par_ll_color_long_line 07xxxxxxx 0700000 1 2 3>(B +par_ll_color_long_line par_ll_color_long_line 08xxxxxxxx 0800000 1 2 3>(B +par_ll_color_long_line par_ll_color_long_line 09xxxxxxxxx 0900000 1 2 3>(B +par_ll_color_long_line par_ll_color_long_line 10xxxxxxxxxx 1000000 1 2 3>(B +par_ll_color_long_line par_ll_color_long_line 11xxxxxxxxxxx 1100000 1 2 3>(B +par_ll_color_long_line par_ll_color_long_line 12xxxxxxxxxxxx 1200000 1 2 3>(B +par_ll_color_long_line par_ll_color_long_line 13xxxxxxxxxxxxx 1300000 1 2 3>(B +par_ll_color_long_line par_ll_color_long_line 14xxxxxxxxxxxxxx 14000>(B +par_ll_color_long_line par_ll_color_long_line 15xxxxxxxxxxxxxxx 15000>(B +par_ll_color_long_line par_ll_color_long_line 16xxxxxxxxxxxxxxxx 16000>(B +par_ll_color_long_line par_ll_color_long_line 17xxxxxxxxxxxxxxxxx 17000>(B +par_ll_color_long_line par_ll_color_long_line 18xxxxxxxxxxxxxxxxxx 18000>(B +par_ll_color_long_line par_ll_color_long_line 19xxxxxxxxxxxxxxxxxxx 19000>(B +par_ll_color_long_line par_ll_color_long_line 20xxxxxxxxxxxxxxxxxxxx 20000>(B +par_ll_color_long_line par_ll_color_long_line 21xxxxxxxxxxxxxxxxxxxxx 21000>(B +par_ll_color_long_line par_ll_color_long_line 22xxxxxxxxxxxxxxxxxxxxxx >(B +par_ll_color_long_line par_ll_color_long_line 23xxxxxxxxxxxxxxxxxxxxxxx >(B +par_ll_color_long_line par_ll_color_long_line 24xxxxxxxxxxxxxxxxxxxxxxxx >(B +par_ll_color_long_line par_ll_color_long_line 25xxxxxxxxxxxxxxxxxxxxxxxxx >(B +par_ll_color_long_line par_ll_color_long_line 26xxxxxxxxxxxxxxxxxxxxxxxxxx >(B +par_ll_color_long_line par_ll_color_long_line 27xxxxxxxxxxxxxxxxxxxxxxxxxxx>(B +par_ll_color_long_line par_ll_color_long_line 28xxxxxxxxxxxxxxxxxxxxxxxxxxx>(B +par_ll_color_long_line par_ll_color_long_line 29xxxxxxxxxxxxxxxxxxxxxxxxxxx>(B +par_ll_color_long_line par_ll_color_long_line 30xxxxxxxxxxxxxxxxxxxxxxxxxxx>(B par_ll_long_line ### --latest-line with lines longer than terminal width par_ll_long_line par_ll_long_line 01x 0100000 1 2 3 4 5 6 7> par_ll_long_line par_ll_long_line 02xx 0200000 1 2 3 4 5 6 7> @@ -633,36 +603,6 @@ par_ll_long_line par_ll_long_line 27xxxxxxxxxxxxxxxxxxxxxxxxxxx> par_ll_long_line par_ll_long_line 28xxxxxxxxxxxxxxxxxxxxxxxxxxx> par_ll_long_line par_ll_long_line 29xxxxxxxxxxxxxxxxxxxxxxxxxxx> par_ll_long_line par_ll_long_line 30xxxxxxxxxxxxxxxxxxxxxxxxxxx> -par_ll_long_line M par_ll_long_line 01x 0100000 1 2 3 4 5 6 7> -par_ll_long_line M par_ll_long_line 02xx 0200000 1 2 3 4 5 6 7> -par_ll_long_line M par_ll_long_line 03xxx 0300000 1 2 3 4 5 6 7> -par_ll_long_line M par_ll_long_line 04xxxx 0400000 1 2 3 4 5 6 7> -par_ll_long_line M par_ll_long_line 05xxxxx 0500000 1 2 3 4 5 6 7> -par_ll_long_line M par_ll_long_line 06xxxxxx 0600000 1 2 3> -par_ll_long_line M par_ll_long_line 07xxxxxxx 0700000 1 2 3> -par_ll_long_line M par_ll_long_line 08xxxxxxxx 0800000 1 2 3> -par_ll_long_line M par_ll_long_line 09xxxxxxxxx 0900000 1 2 3> -par_ll_long_line M par_ll_long_line 10xxxxxxxxxx 1000000 1 2 3> -par_ll_long_line M par_ll_long_line 11xxxxxxxxxxx 1100000 1 2 3> -par_ll_long_line M par_ll_long_line 12xxxxxxxxxxxx 1200000 1 2 3> -par_ll_long_line M par_ll_long_line 13xxxxxxxxxxxxx 1300000 1 2 3> -par_ll_long_line M par_ll_long_line 14xxxxxxxxxxxxxx 14000> -par_ll_long_line M par_ll_long_line 15xxxxxxxxxxxxxxx 15000> -par_ll_long_line M par_ll_long_line 16xxxxxxxxxxxxxxxx 16000> -par_ll_long_line M par_ll_long_line 17xxxxxxxxxxxxxxxxx 17000> -par_ll_long_line M par_ll_long_line 18xxxxxxxxxxxxxxxxxx 18000> -par_ll_long_line M par_ll_long_line 19xxxxxxxxxxxxxxxxxxx 19000> -par_ll_long_line M par_ll_long_line 20xxxxxxxxxxxxxxxxxxxx 20000> -par_ll_long_line M par_ll_long_line 21xxxxxxxxxxxxxxxxxxxxx 21000> -par_ll_long_line M par_ll_long_line 22xxxxxxxxxxxxxxxxxxxxxx > -par_ll_long_line M par_ll_long_line 23xxxxxxxxxxxxxxxxxxxxxxx > -par_ll_long_line M par_ll_long_line 24xxxxxxxxxxxxxxxxxxxxxxxx > -par_ll_long_line M par_ll_long_line 25xxxxxxxxxxxxxxxxxxxxxxxxx > -par_ll_long_line M par_ll_long_line 26xxxxxxxxxxxxxxxxxxxxxxxxxx > -par_ll_long_line M par_ll_long_line 27xxxxxxxxxxxxxxxxxxxxxxxxxxx> -par_ll_long_line M par_ll_long_line 28xxxxxxxxxxxxxxxxxxxxxxxxxxx> -par_ll_long_line M par_ll_long_line 29xxxxxxxxxxxxxxxxxxxxxxxxxxx> -par_ll_long_line M par_ll_long_line 30xxxxxxxxxxxxxxxxxxxxxxxxxxx> par_load_blocks ### Test if --load blocks. Bug. par_load_blocks 53d025127ae99ab79e8502aae2d9bea6 - par_load_blocks 53d025127ae99ab79e8502aae2d9bea6 - @@ -1218,9 +1158,9 @@ par_shellquote tcsh \\\\\\\\ "\ par_shellquote tcsh "\ \ \ par_shellquote tcsh \\\\\\\\\\\\\\ \!\"\#\$%\&\'\(\)\*+,-./0123456789:\;\<\=\>\?@ABCDEFGHIJKLMNOPQRSTUVWXYZ\[\\\]\^_\`abcdefghijklmnopqrstuvwxyz\{\|\}\~\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ par_sockets_cores_threads ### Test --number-of-sockets/cores/threads par_sockets_cores_threads 1 +par_sockets_cores_threads 2 par_sockets_cores_threads 4 -par_sockets_cores_threads 8 -par_sockets_cores_threads 4 +par_sockets_cores_threads 2 par_sockets_cores_threads ### Test --use-sockets-instead-of-threads par_sockets_cores_threads threads done par_sockets_cores_threads sockets done diff --git a/testsuite/wanted-results/parallel-local-1s b/testsuite/wanted-results/parallel-local-1s index 26828e23..a36a83e3 100644 --- a/testsuite/wanted-results/parallel-local-1s +++ b/testsuite/wanted-results/parallel-local-1s @@ -423,13 +423,13 @@ par_progress Computer:jobs running/jobs completed/%of started jobs/Average secon par_progress local:0/3/100%/9.9s  par_progress par_progress Computers / CPU cores / Max jobs to run -par_progress 1:local / 4 / 4 +par_progress 1:local / 2 / 2 par_progress par_progress Computer:jobs running/jobs completed/%of started jobs/Average seconds to complete par_progress local:0/3/100%/9.9s  par_progress par_progress Computers / CPU threads / Max jobs to run -par_progress 1:local / 8 / 8 +par_progress 1:local / 4 / 4 par_progress par_progress Computer:jobs running/jobs completed/%of started jobs/Average seconds to complete par_progress local:0/3/100%/9.9s  diff --git a/testsuite/wanted-results/parallel-local-3s b/testsuite/wanted-results/parallel-local-3s index 86bb7dfa..a0ffa1f3 100644 --- a/testsuite/wanted-results/parallel-local-3s +++ b/testsuite/wanted-results/parallel-local-3s @@ -575,7 +575,7 @@ par__test_cpu_detection_cpuinfo 2-12-24-12 Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.4 par__test_cpu_detection_cpuinfo 2 12 24 12 par__test_cpu_detection_cpuinfo 1-6-12-6 AMD Ryzen 5 4600G with Radeon Graphics (ai) par__test_cpu_detection_cpuinfo 1 6 12 6 -par__test_cpu_detection_cpuinfo 1-4-8-4 Lenovo E540 i7-4712MQ +par__test_cpu_detection_cpuinfo 1-4-8-4 Lenovo E540 i7-4712MQ (PROSA stud organizer) par__test_cpu_detection_cpuinfo 1 4 8 4 par__test_cpu_detection_cpuinfo 1-4-8-4 Core i7-3632QM Acer laptop par__test_cpu_detection_cpuinfo 1 4 8 4 @@ -607,7 +607,7 @@ par__test_cpu_detection_lscpu 2-12-24-12 Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40G par__test_cpu_detection_lscpu 2 12 24 12 par__test_cpu_detection_lscpu 1-6-12-6 AMD Ryzen 5 4600G with Radeon Graphics (ai) par__test_cpu_detection_lscpu 1 6 12 6 -par__test_cpu_detection_lscpu 1-4-8-4 Lenovo E540 i7-4712MQ +par__test_cpu_detection_lscpu 1-4-8-4 Lenovo E540 i7-4712MQ (PROSA stud organizer) par__test_cpu_detection_lscpu 1 4 8 4 par__test_cpu_detection_lscpu 1-4-8-4 Core i7-3632QM Acer laptop par__test_cpu_detection_lscpu 1 4 8 4 @@ -617,8 +617,13 @@ par__test_cpu_detection_lscpu 1-8-8-8 Huawei P Smart Octa-core (4x2.36 GHz Corte par__test_cpu_detection_lscpu 2 8 8 8 par__test_cpu_detection_lscpu 1-4-4-4 x96 quad-core Android TV-box par__test_cpu_detection_lscpu 1 1 1 1 -par__test_cpu_detection_topology 1-4-8-4 Lenovo E540 i7-4712MQ +par__test_cpu_detection_topology 4-64-64-64 Dell R815 4 CPU 64-core +par__test_cpu_detection_topology 1-2-2-2 AMD Neo N36L Dual-Core Processor +par__test_cpu_detection_topology 1 2 2 2 +par__test_cpu_detection_topology 1-4-8-4 Lenovo E540 i7-4712MQ (PROSA stud organizer) par__test_cpu_detection_topology 1 4 8 4 +par__test_cpu_detection_topology 1-2-4-2 ThinkPad A475 AMD PRO A12-8830B R7 (64g) +par__test_cpu_detection_topology 1 2 4 2 par_children_receive_sig ### Do children receive --termseq signals par_children_receive_sig parallel: Warning: This job was killed because it timed out: par_children_receive_sig parallel: Warning: show_signals '' diff --git a/testsuite/wanted-results/parallel-local-ssh5 b/testsuite/wanted-results/parallel-local-ssh5 index c4c5f6f3..f4af00f2 100644 --- a/testsuite/wanted-results/parallel-local-ssh5 +++ b/testsuite/wanted-results/parallel-local-ssh5 @@ -245,74 +245,74 @@ par__--shellquote_command_len -Slo -j10 ' 10 7 0 0 0 par__--shellquote_command_len -Slo -j10 ' 10 8 0 0 0 par__--shellquote_command_len -Slo -j10 ' 10 9 0 0 0 par__--shellquote_command_len -Slo -j10 ' 10 10 0 0 0 -par__--shellquote_command_len -Slo -j10 " 1 9 parallel: Error: Command line too long (98xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 1 10 parallel: Error: Command line too long (295xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 2 8 parallel: Error: Command line too long (65xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 2 9 parallel: Error: Command line too long (196xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 2 10 parallel: Error: Command line too long (590xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 3 8 parallel: Error: Command line too long (98xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 3 9 parallel: Error: Command line too long (295xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 3 10 parallel: Error: Command line too long (885xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 4 8 parallel: Error: Command line too long (131xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 4 9 parallel: Error: Command line too long (393xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 4 10 parallel: Error: Command line too long (1180xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 5 8 parallel: Error: Command line too long (164xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 5 9 parallel: Error: Command line too long (492xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 5 10 parallel: Error: Command line too long (1476xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 6 7 parallel: Error: Command line too long (65xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 6 8 parallel: Error: Command line too long (196xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 6 9 parallel: Error: Command line too long (590xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 6 10 parallel: Error: Command line too long (1771xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 7 7 parallel: Error: Command line too long (76xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 7 8 parallel: Error: Command line too long (229xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 7 9 parallel: Error: Command line too long (688xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 7 10 parallel: Error: Command line too long (2066xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 8 7 parallel: Error: Command line too long (87xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 8 8 parallel: Error: Command line too long (262xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 8 9 parallel: Error: Command line too long (787xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 8 10 parallel: Error: Command line too long (2361xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 9 7 parallel: Error: Command line too long (98xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 9 8 parallel: Error: Command line too long (295xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 9 9 parallel: Error: Command line too long (885xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 9 10 parallel: Error: Command line too long (2657xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 10 7 parallel: Error: Command line too long (109xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 10 8 parallel: Error: Command line too long (328xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 10 9 parallel: Error: Command line too long (984xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 " 10 10 parallel: Error: Command line too long (2952xxx >= 63xxx) at input 0: " -par__--shellquote_command_len -Slo -j10 ' 1 9 parallel: Error: Command line too long (98xxx >= 63xxx) at input 0: ' -par__--shellquote_command_len -Slo -j10 ' 1 10 parallel: Error: Command line too long (295xxx >= 63xxx) at input 0: ' -par__--shellquote_command_len -Slo -j10 ' 2 8 parallel: Error: Command line too long (65xxx >= 63xxx) at input 0: '' -par__--shellquote_command_len -Slo -j10 ' 2 9 parallel: Error: Command line too long (196xxx >= 63xxx) at input 0: '' -par__--shellquote_command_len -Slo -j10 ' 2 10 parallel: Error: Command line too long (590xxx >= 63xxx) at input 0: '' -par__--shellquote_command_len -Slo -j10 ' 3 8 parallel: Error: Command line too long (98xxx >= 63xxx) at input 0: ''' -par__--shellquote_command_len -Slo -j10 ' 3 9 parallel: Error: Command line too long (295xxx >= 63xxx) at input 0: ''' -par__--shellquote_command_len -Slo -j10 ' 3 10 parallel: Error: Command line too long (885xxx >= 63xxx) at input 0: ''' -par__--shellquote_command_len -Slo -j10 ' 4 8 parallel: Error: Command line too long (131xxx >= 63xxx) at input 0: '''' -par__--shellquote_command_len -Slo -j10 ' 4 9 parallel: Error: Command line too long (393xxx >= 63xxx) at input 0: '''' -par__--shellquote_command_len -Slo -j10 ' 4 10 parallel: Error: Command line too long (1180xxx >= 63xxx) at input 0: '''' -par__--shellquote_command_len -Slo -j10 ' 5 8 parallel: Error: Command line too long (164xxx >= 63xxx) at input 0: ''''' -par__--shellquote_command_len -Slo -j10 ' 5 9 parallel: Error: Command line too long (492xxx >= 63xxx) at input 0: ''''' -par__--shellquote_command_len -Slo -j10 ' 5 10 parallel: Error: Command line too long (1476xxx >= 63xxx) at input 0: ''''' -par__--shellquote_command_len -Slo -j10 ' 6 7 parallel: Error: Command line too long (65xxx >= 63xxx) at input 0: '''''' -par__--shellquote_command_len -Slo -j10 ' 6 8 parallel: Error: Command line too long (196xxx >= 63xxx) at input 0: '''''' -par__--shellquote_command_len -Slo -j10 ' 6 9 parallel: Error: Command line too long (590xxx >= 63xxx) at input 0: '''''' -par__--shellquote_command_len -Slo -j10 ' 6 10 parallel: Error: Command line too long (1771xxx >= 63xxx) at input 0: '''''' -par__--shellquote_command_len -Slo -j10 ' 7 7 parallel: Error: Command line too long (76xxx >= 63xxx) at input 0: ''''''' -par__--shellquote_command_len -Slo -j10 ' 7 8 parallel: Error: Command line too long (229xxx >= 63xxx) at input 0: ''''''' -par__--shellquote_command_len -Slo -j10 ' 7 9 parallel: Error: Command line too long (688xxx >= 63xxx) at input 0: ''''''' -par__--shellquote_command_len -Slo -j10 ' 7 10 parallel: Error: Command line too long (2066xxx >= 63xxx) at input 0: ''''''' -par__--shellquote_command_len -Slo -j10 ' 8 7 parallel: Error: Command line too long (87xxx >= 63xxx) at input 0: '''''''' -par__--shellquote_command_len -Slo -j10 ' 8 8 parallel: Error: Command line too long (262xxx >= 63xxx) at input 0: '''''''' -par__--shellquote_command_len -Slo -j10 ' 8 9 parallel: Error: Command line too long (787xxx >= 63xxx) at input 0: '''''''' -par__--shellquote_command_len -Slo -j10 ' 8 10 parallel: Error: Command line too long (2361xxx >= 63xxx) at input 0: '''''''' -par__--shellquote_command_len -Slo -j10 ' 9 7 parallel: Error: Command line too long (98xxx >= 63xxx) at input 0: ''''''''' -par__--shellquote_command_len -Slo -j10 ' 9 8 parallel: Error: Command line too long (295xxx >= 63xxx) at input 0: ''''''''' -par__--shellquote_command_len -Slo -j10 ' 9 9 parallel: Error: Command line too long (885xxx >= 63xxx) at input 0: ''''''''' -par__--shellquote_command_len -Slo -j10 ' 9 10 parallel: Error: Command line too long (2657xxx >= 63xxx) at input 0: ''''''''' -par__--shellquote_command_len -Slo -j10 ' 10 7 parallel: Error: Command line too long (109xxx >= 63xxx) at input 0: '''''''''' -par__--shellquote_command_len -Slo -j10 ' 10 8 parallel: Error: Command line too long (328xxx >= 63xxx) at input 0: '''''''''' -par__--shellquote_command_len -Slo -j10 ' 10 9 parallel: Error: Command line too long (984xxx >= 63xxx) at input 0: '''''''''' -par__--shellquote_command_len -Slo -j10 ' 10 10 parallel: Error: Command line too long (2952xxx >= 63xxx) at input 0: '''''''''' +par__--shellquote_command_len -Slo -j10 " 1 9 parallel: Error: Command line too long (9xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 1 10 parallel: Error: Command line too long (29xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 2 8 parallel: Error: Command line too long (6xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 2 9 parallel: Error: Command line too long (19xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 2 10 parallel: Error: Command line too long (59xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 3 8 parallel: Error: Command line too long (9xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 3 9 parallel: Error: Command line too long (29xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 3 10 parallel: Error: Command line too long (88xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 4 8 parallel: Error: Command line too long (13xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 4 9 parallel: Error: Command line too long (39xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 4 10 parallel: Error: Command line too long (118xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 5 8 parallel: Error: Command line too long (16xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 5 9 parallel: Error: Command line too long (49xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 5 10 parallel: Error: Command line too long (147xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 6 7 parallel: Error: Command line too long (6xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 6 8 parallel: Error: Command line too long (19xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 6 9 parallel: Error: Command line too long (59xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 6 10 parallel: Error: Command line too long (177xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 7 7 parallel: Error: Command line too long (7xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 7 8 parallel: Error: Command line too long (22xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 7 9 parallel: Error: Command line too long (68xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 7 10 parallel: Error: Command line too long (206xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 8 7 parallel: Error: Command line too long (8xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 8 8 parallel: Error: Command line too long (26xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 8 9 parallel: Error: Command line too long (78xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 8 10 parallel: Error: Command line too long (236xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 9 7 parallel: Error: Command line too long (9xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 9 8 parallel: Error: Command line too long (29xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 9 9 parallel: Error: Command line too long (88xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 9 10 parallel: Error: Command line too long (265xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 10 7 parallel: Error: Command line too long (10xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 10 8 parallel: Error: Command line too long (32xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 10 9 parallel: Error: Command line too long (98xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 " 10 10 parallel: Error: Command line too long (295xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len -Slo -j10 ' 1 9 parallel: Error: Command line too long (9xxxx >= 6xxxx) at input 0: ' +par__--shellquote_command_len -Slo -j10 ' 1 10 parallel: Error: Command line too long (29xxxx >= 6xxxx) at input 0: ' +par__--shellquote_command_len -Slo -j10 ' 2 8 parallel: Error: Command line too long (6xxxx >= 6xxxx) at input 0: '' +par__--shellquote_command_len -Slo -j10 ' 2 9 parallel: Error: Command line too long (19xxxx >= 6xxxx) at input 0: '' +par__--shellquote_command_len -Slo -j10 ' 2 10 parallel: Error: Command line too long (59xxxx >= 6xxxx) at input 0: '' +par__--shellquote_command_len -Slo -j10 ' 3 8 parallel: Error: Command line too long (9xxxx >= 6xxxx) at input 0: ''' +par__--shellquote_command_len -Slo -j10 ' 3 9 parallel: Error: Command line too long (29xxxx >= 6xxxx) at input 0: ''' +par__--shellquote_command_len -Slo -j10 ' 3 10 parallel: Error: Command line too long (88xxxx >= 6xxxx) at input 0: ''' +par__--shellquote_command_len -Slo -j10 ' 4 8 parallel: Error: Command line too long (13xxxx >= 6xxxx) at input 0: '''' +par__--shellquote_command_len -Slo -j10 ' 4 9 parallel: Error: Command line too long (39xxxx >= 6xxxx) at input 0: '''' +par__--shellquote_command_len -Slo -j10 ' 4 10 parallel: Error: Command line too long (118xxxx >= 6xxxx) at input 0: '''' +par__--shellquote_command_len -Slo -j10 ' 5 8 parallel: Error: Command line too long (16xxxx >= 6xxxx) at input 0: ''''' +par__--shellquote_command_len -Slo -j10 ' 5 9 parallel: Error: Command line too long (49xxxx >= 6xxxx) at input 0: ''''' +par__--shellquote_command_len -Slo -j10 ' 5 10 parallel: Error: Command line too long (147xxxx >= 6xxxx) at input 0: ''''' +par__--shellquote_command_len -Slo -j10 ' 6 7 parallel: Error: Command line too long (6xxxx >= 6xxxx) at input 0: '''''' +par__--shellquote_command_len -Slo -j10 ' 6 8 parallel: Error: Command line too long (19xxxx >= 6xxxx) at input 0: '''''' +par__--shellquote_command_len -Slo -j10 ' 6 9 parallel: Error: Command line too long (59xxxx >= 6xxxx) at input 0: '''''' +par__--shellquote_command_len -Slo -j10 ' 6 10 parallel: Error: Command line too long (177xxxx >= 6xxxx) at input 0: '''''' +par__--shellquote_command_len -Slo -j10 ' 7 7 parallel: Error: Command line too long (7xxxx >= 6xxxx) at input 0: ''''''' +par__--shellquote_command_len -Slo -j10 ' 7 8 parallel: Error: Command line too long (22xxxx >= 6xxxx) at input 0: ''''''' +par__--shellquote_command_len -Slo -j10 ' 7 9 parallel: Error: Command line too long (68xxxx >= 6xxxx) at input 0: ''''''' +par__--shellquote_command_len -Slo -j10 ' 7 10 parallel: Error: Command line too long (206xxxx >= 6xxxx) at input 0: ''''''' +par__--shellquote_command_len -Slo -j10 ' 8 7 parallel: Error: Command line too long (8xxxx >= 6xxxx) at input 0: '''''''' +par__--shellquote_command_len -Slo -j10 ' 8 8 parallel: Error: Command line too long (26xxxx >= 6xxxx) at input 0: '''''''' +par__--shellquote_command_len -Slo -j10 ' 8 9 parallel: Error: Command line too long (78xxxx >= 6xxxx) at input 0: '''''''' +par__--shellquote_command_len -Slo -j10 ' 8 10 parallel: Error: Command line too long (236xxxx >= 6xxxx) at input 0: '''''''' +par__--shellquote_command_len -Slo -j10 ' 9 7 parallel: Error: Command line too long (9xxxx >= 6xxxx) at input 0: ''''''''' +par__--shellquote_command_len -Slo -j10 ' 9 8 parallel: Error: Command line too long (29xxxx >= 6xxxx) at input 0: ''''''''' +par__--shellquote_command_len -Slo -j10 ' 9 9 parallel: Error: Command line too long (88xxxx >= 6xxxx) at input 0: ''''''''' +par__--shellquote_command_len -Slo -j10 ' 9 10 parallel: Error: Command line too long (265xxxx >= 6xxxx) at input 0: ''''''''' +par__--shellquote_command_len -Slo -j10 ' 10 7 parallel: Error: Command line too long (10xxxx >= 6xxxx) at input 0: '''''''''' +par__--shellquote_command_len -Slo -j10 ' 10 8 parallel: Error: Command line too long (32xxxx >= 6xxxx) at input 0: '''''''''' +par__--shellquote_command_len -Slo -j10 ' 10 9 parallel: Error: Command line too long (98xxxx >= 6xxxx) at input 0: '''''''''' +par__--shellquote_command_len -Slo -j10 ' 10 10 parallel: Error: Command line too long (295xxxx >= 6xxxx) at input 0: '''''''''' par__--shellquote_command_len " 1 1 1 2 6 par__--shellquote_command_len " 1 2 1 2 12 par__--shellquote_command_len " 1 3 1 2 30 @@ -513,86 +513,86 @@ par__--shellquote_command_len ' 10 7 0 0 0 par__--shellquote_command_len ' 10 8 0 0 0 par__--shellquote_command_len ' 10 9 0 0 0 par__--shellquote_command_len ' 10 10 0 0 0 -par__--shellquote_command_len " 1 8 parallel: Error: Command line too long (65xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 1 9 parallel: Error: Command line too long (196xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 1 10 parallel: Error: Command line too long (590xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 2 8 parallel: Error: Command line too long (131xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 2 9 parallel: Error: Command line too long (393xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 2 10 parallel: Error: Command line too long (1180xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 3 7 parallel: Error: Command line too long (65xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 3 8 parallel: Error: Command line too long (196xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 3 9 parallel: Error: Command line too long (590xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 3 10 parallel: Error: Command line too long (1771xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 4 7 parallel: Error: Command line too long (87xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 4 8 parallel: Error: Command line too long (262xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 4 9 parallel: Error: Command line too long (787xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 4 10 parallel: Error: Command line too long (2361xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 5 7 parallel: Error: Command line too long (109xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 5 8 parallel: Error: Command line too long (328xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 5 9 parallel: Error: Command line too long (984xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 5 10 parallel: Error: Command line too long (2952xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 6 7 parallel: Error: Command line too long (131xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 6 8 parallel: Error: Command line too long (393xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 6 9 parallel: Error: Command line too long (1180xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 6 10 parallel: Error: Command line too long (3542xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 7 7 parallel: Error: Command line too long (153xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 7 8 parallel: Error: Command line too long (459xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 7 9 parallel: Error: Command line too long (1377xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 7 10 parallel: Error: Command line too long (4133xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 8 7 parallel: Error: Command line too long (174xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 8 8 parallel: Error: Command line too long (524xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 8 9 parallel: Error: Command line too long (1574xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 8 10 parallel: Error: Command line too long (4723xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 9 6 parallel: Error: Command line too long (65xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 9 7 parallel: Error: Command line too long (196xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 9 8 parallel: Error: Command line too long (590xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 9 9 parallel: Error: Command line too long (1771xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 9 10 parallel: Error: Command line too long (5314xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 10 6 parallel: Error: Command line too long (72xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 10 7 parallel: Error: Command line too long (218xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 10 8 parallel: Error: Command line too long (656xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 10 9 parallel: Error: Command line too long (1968xxx >= 63xxx) at input 0: " -par__--shellquote_command_len " 10 10 parallel: Error: Command line too long (5904xxx >= 63xxx) at input 0: " -par__--shellquote_command_len ' 1 8 parallel: Error: Command line too long (65xxx >= 63xxx) at input 0: ' -par__--shellquote_command_len ' 1 9 parallel: Error: Command line too long (196xxx >= 63xxx) at input 0: ' -par__--shellquote_command_len ' 1 10 parallel: Error: Command line too long (590xxx >= 63xxx) at input 0: ' -par__--shellquote_command_len ' 2 8 parallel: Error: Command line too long (131xxx >= 63xxx) at input 0: '' -par__--shellquote_command_len ' 2 9 parallel: Error: Command line too long (393xxx >= 63xxx) at input 0: '' -par__--shellquote_command_len ' 2 10 parallel: Error: Command line too long (1180xxx >= 63xxx) at input 0: '' -par__--shellquote_command_len ' 3 7 parallel: Error: Command line too long (65xxx >= 63xxx) at input 0: ''' -par__--shellquote_command_len ' 3 8 parallel: Error: Command line too long (196xxx >= 63xxx) at input 0: ''' -par__--shellquote_command_len ' 3 9 parallel: Error: Command line too long (590xxx >= 63xxx) at input 0: ''' -par__--shellquote_command_len ' 3 10 parallel: Error: Command line too long (1771xxx >= 63xxx) at input 0: ''' -par__--shellquote_command_len ' 4 7 parallel: Error: Command line too long (87xxx >= 63xxx) at input 0: '''' -par__--shellquote_command_len ' 4 8 parallel: Error: Command line too long (262xxx >= 63xxx) at input 0: '''' -par__--shellquote_command_len ' 4 9 parallel: Error: Command line too long (787xxx >= 63xxx) at input 0: '''' -par__--shellquote_command_len ' 4 10 parallel: Error: Command line too long (2361xxx >= 63xxx) at input 0: '''' -par__--shellquote_command_len ' 5 7 parallel: Error: Command line too long (109xxx >= 63xxx) at input 0: ''''' -par__--shellquote_command_len ' 5 8 parallel: Error: Command line too long (328xxx >= 63xxx) at input 0: ''''' -par__--shellquote_command_len ' 5 9 parallel: Error: Command line too long (984xxx >= 63xxx) at input 0: ''''' -par__--shellquote_command_len ' 5 10 parallel: Error: Command line too long (2952xxx >= 63xxx) at input 0: ''''' -par__--shellquote_command_len ' 6 7 parallel: Error: Command line too long (131xxx >= 63xxx) at input 0: '''''' -par__--shellquote_command_len ' 6 8 parallel: Error: Command line too long (393xxx >= 63xxx) at input 0: '''''' -par__--shellquote_command_len ' 6 9 parallel: Error: Command line too long (1180xxx >= 63xxx) at input 0: '''''' -par__--shellquote_command_len ' 6 10 parallel: Error: Command line too long (3542xxx >= 63xxx) at input 0: '''''' -par__--shellquote_command_len ' 7 7 parallel: Error: Command line too long (153xxx >= 63xxx) at input 0: ''''''' -par__--shellquote_command_len ' 7 8 parallel: Error: Command line too long (459xxx >= 63xxx) at input 0: ''''''' -par__--shellquote_command_len ' 7 9 parallel: Error: Command line too long (1377xxx >= 63xxx) at input 0: ''''''' -par__--shellquote_command_len ' 7 10 parallel: Error: Command line too long (4133xxx >= 63xxx) at input 0: ''''''' -par__--shellquote_command_len ' 8 7 parallel: Error: Command line too long (174xxx >= 63xxx) at input 0: '''''''' -par__--shellquote_command_len ' 8 8 parallel: Error: Command line too long (524xxx >= 63xxx) at input 0: '''''''' -par__--shellquote_command_len ' 8 9 parallel: Error: Command line too long (1574xxx >= 63xxx) at input 0: '''''''' -par__--shellquote_command_len ' 8 10 parallel: Error: Command line too long (4723xxx >= 63xxx) at input 0: '''''''' -par__--shellquote_command_len ' 9 6 parallel: Error: Command line too long (65xxx >= 63xxx) at input 0: ''''''''' -par__--shellquote_command_len ' 9 7 parallel: Error: Command line too long (196xxx >= 63xxx) at input 0: ''''''''' -par__--shellquote_command_len ' 9 8 parallel: Error: Command line too long (590xxx >= 63xxx) at input 0: ''''''''' -par__--shellquote_command_len ' 9 9 parallel: Error: Command line too long (1771xxx >= 63xxx) at input 0: ''''''''' -par__--shellquote_command_len ' 9 10 parallel: Error: Command line too long (5314xxx >= 63xxx) at input 0: ''''''''' -par__--shellquote_command_len ' 10 6 parallel: Error: Command line too long (72xxx >= 63xxx) at input 0: '''''''''' -par__--shellquote_command_len ' 10 7 parallel: Error: Command line too long (218xxx >= 63xxx) at input 0: '''''''''' -par__--shellquote_command_len ' 10 8 parallel: Error: Command line too long (656xxx >= 63xxx) at input 0: '''''''''' -par__--shellquote_command_len ' 10 9 parallel: Error: Command line too long (1968xxx >= 63xxx) at input 0: '''''''''' -par__--shellquote_command_len ' 10 10 parallel: Error: Command line too long (5904xxx >= 63xxx) at input 0: '''''''''' +par__--shellquote_command_len " 1 8 parallel: Error: Command line too long (6xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 1 9 parallel: Error: Command line too long (19xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 1 10 parallel: Error: Command line too long (59xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 2 8 parallel: Error: Command line too long (13xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 2 9 parallel: Error: Command line too long (39xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 2 10 parallel: Error: Command line too long (118xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 3 7 parallel: Error: Command line too long (6xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 3 8 parallel: Error: Command line too long (19xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 3 9 parallel: Error: Command line too long (59xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 3 10 parallel: Error: Command line too long (177xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 4 7 parallel: Error: Command line too long (8xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 4 8 parallel: Error: Command line too long (26xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 4 9 parallel: Error: Command line too long (78xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 4 10 parallel: Error: Command line too long (236xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 5 7 parallel: Error: Command line too long (10xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 5 8 parallel: Error: Command line too long (32xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 5 9 parallel: Error: Command line too long (98xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 5 10 parallel: Error: Command line too long (295xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 6 7 parallel: Error: Command line too long (13xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 6 8 parallel: Error: Command line too long (39xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 6 9 parallel: Error: Command line too long (118xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 6 10 parallel: Error: Command line too long (354xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 7 7 parallel: Error: Command line too long (15xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 7 8 parallel: Error: Command line too long (45xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 7 9 parallel: Error: Command line too long (137xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 7 10 parallel: Error: Command line too long (413xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 8 7 parallel: Error: Command line too long (17xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 8 8 parallel: Error: Command line too long (52xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 8 9 parallel: Error: Command line too long (157xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 8 10 parallel: Error: Command line too long (472xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 9 6 parallel: Error: Command line too long (6xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 9 7 parallel: Error: Command line too long (19xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 9 8 parallel: Error: Command line too long (59xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 9 9 parallel: Error: Command line too long (177xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 9 10 parallel: Error: Command line too long (531xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 10 6 parallel: Error: Command line too long (7xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 10 7 parallel: Error: Command line too long (21xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 10 8 parallel: Error: Command line too long (65xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 10 9 parallel: Error: Command line too long (196xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len " 10 10 parallel: Error: Command line too long (590xxxx >= 6xxxx) at input 0: " +par__--shellquote_command_len ' 1 8 parallel: Error: Command line too long (6xxxx >= 6xxxx) at input 0: ' +par__--shellquote_command_len ' 1 9 parallel: Error: Command line too long (19xxxx >= 6xxxx) at input 0: ' +par__--shellquote_command_len ' 1 10 parallel: Error: Command line too long (59xxxx >= 6xxxx) at input 0: ' +par__--shellquote_command_len ' 2 8 parallel: Error: Command line too long (13xxxx >= 6xxxx) at input 0: '' +par__--shellquote_command_len ' 2 9 parallel: Error: Command line too long (39xxxx >= 6xxxx) at input 0: '' +par__--shellquote_command_len ' 2 10 parallel: Error: Command line too long (118xxxx >= 6xxxx) at input 0: '' +par__--shellquote_command_len ' 3 7 parallel: Error: Command line too long (6xxxx >= 6xxxx) at input 0: ''' +par__--shellquote_command_len ' 3 8 parallel: Error: Command line too long (19xxxx >= 6xxxx) at input 0: ''' +par__--shellquote_command_len ' 3 9 parallel: Error: Command line too long (59xxxx >= 6xxxx) at input 0: ''' +par__--shellquote_command_len ' 3 10 parallel: Error: Command line too long (177xxxx >= 6xxxx) at input 0: ''' +par__--shellquote_command_len ' 4 7 parallel: Error: Command line too long (8xxxx >= 6xxxx) at input 0: '''' +par__--shellquote_command_len ' 4 8 parallel: Error: Command line too long (26xxxx >= 6xxxx) at input 0: '''' +par__--shellquote_command_len ' 4 9 parallel: Error: Command line too long (78xxxx >= 6xxxx) at input 0: '''' +par__--shellquote_command_len ' 4 10 parallel: Error: Command line too long (236xxxx >= 6xxxx) at input 0: '''' +par__--shellquote_command_len ' 5 7 parallel: Error: Command line too long (10xxxx >= 6xxxx) at input 0: ''''' +par__--shellquote_command_len ' 5 8 parallel: Error: Command line too long (32xxxx >= 6xxxx) at input 0: ''''' +par__--shellquote_command_len ' 5 9 parallel: Error: Command line too long (98xxxx >= 6xxxx) at input 0: ''''' +par__--shellquote_command_len ' 5 10 parallel: Error: Command line too long (295xxxx >= 6xxxx) at input 0: ''''' +par__--shellquote_command_len ' 6 7 parallel: Error: Command line too long (13xxxx >= 6xxxx) at input 0: '''''' +par__--shellquote_command_len ' 6 8 parallel: Error: Command line too long (39xxxx >= 6xxxx) at input 0: '''''' +par__--shellquote_command_len ' 6 9 parallel: Error: Command line too long (118xxxx >= 6xxxx) at input 0: '''''' +par__--shellquote_command_len ' 6 10 parallel: Error: Command line too long (354xxxx >= 6xxxx) at input 0: '''''' +par__--shellquote_command_len ' 7 7 parallel: Error: Command line too long (15xxxx >= 6xxxx) at input 0: ''''''' +par__--shellquote_command_len ' 7 8 parallel: Error: Command line too long (45xxxx >= 6xxxx) at input 0: ''''''' +par__--shellquote_command_len ' 7 9 parallel: Error: Command line too long (137xxxx >= 6xxxx) at input 0: ''''''' +par__--shellquote_command_len ' 7 10 parallel: Error: Command line too long (413xxxx >= 6xxxx) at input 0: ''''''' +par__--shellquote_command_len ' 8 7 parallel: Error: Command line too long (17xxxx >= 6xxxx) at input 0: '''''''' +par__--shellquote_command_len ' 8 8 parallel: Error: Command line too long (52xxxx >= 6xxxx) at input 0: '''''''' +par__--shellquote_command_len ' 8 9 parallel: Error: Command line too long (157xxxx >= 6xxxx) at input 0: '''''''' +par__--shellquote_command_len ' 8 10 parallel: Error: Command line too long (472xxxx >= 6xxxx) at input 0: '''''''' +par__--shellquote_command_len ' 9 6 parallel: Error: Command line too long (6xxxx >= 6xxxx) at input 0: ''''''''' +par__--shellquote_command_len ' 9 7 parallel: Error: Command line too long (19xxxx >= 6xxxx) at input 0: ''''''''' +par__--shellquote_command_len ' 9 8 parallel: Error: Command line too long (59xxxx >= 6xxxx) at input 0: ''''''''' +par__--shellquote_command_len ' 9 9 parallel: Error: Command line too long (177xxxx >= 6xxxx) at input 0: ''''''''' +par__--shellquote_command_len ' 9 10 parallel: Error: Command line too long (531xxxx >= 6xxxx) at input 0: ''''''''' +par__--shellquote_command_len ' 10 6 parallel: Error: Command line too long (7xxxx >= 6xxxx) at input 0: '''''''''' +par__--shellquote_command_len ' 10 7 parallel: Error: Command line too long (21xxxx >= 6xxxx) at input 0: '''''''''' +par__--shellquote_command_len ' 10 8 parallel: Error: Command line too long (65xxxx >= 6xxxx) at input 0: '''''''''' +par__--shellquote_command_len ' 10 9 parallel: Error: Command line too long (196xxxx >= 6xxxx) at input 0: '''''''''' +par__--shellquote_command_len ' 10 10 parallel: Error: Command line too long (590xxxx >= 6xxxx) at input 0: '''''''''' par__basefile_cleanup ### bug #46520: --basefile cleans up without --cleanup par__basefile_cleanup bug_46520 par__basefile_cleanup bug_46520 diff --git a/testsuite/wanted-results/parallel-local-ssh7 b/testsuite/wanted-results/parallel-local-ssh7 index e6887752..b222a118 100644 --- a/testsuite/wanted-results/parallel-local-ssh7 +++ b/testsuite/wanted-results/parallel-local-ssh7 @@ -1858,86 +1858,14 @@ par_environment_too_big_zsh OK_bigfunc_remote par_environment_too_big_zsh OK_bigfunc_quote par_environment_too_big_zsh OK_bigfunc_quote_remote par_environment_too_big_zsh Rest should fail -par_environment_too_big_zsh _which_PAR:999: argument list too long: perl -par_environment_too_big_zsh env_parallel: Error: Your environment is too big. -par_environment_too_big_zsh env_parallel: Error: You can try 3 different approaches: -par_environment_too_big_zsh env_parallel: Error: 1. Run 'env_parallel --session' before you set -par_environment_too_big_zsh env_parallel: Error: variables or define functions. -par_environment_too_big_zsh env_parallel: Error: 2. Use --env and only mention the names to copy. -par_environment_too_big_zsh env_parallel: Error: 3. Try running this in a clean environment once: -par_environment_too_big_zsh env_parallel: Error: env_parallel --record-env -par_environment_too_big_zsh env_parallel: Error: And then use '--env _' -par_environment_too_big_zsh env_parallel: Error: For details see: man env_parallel -par_environment_too_big_zsh _which_PAR:999: argument list too long: perl -par_environment_too_big_zsh env_parallel: Error: Your environment is too big. -par_environment_too_big_zsh env_parallel: Error: You can try 3 different approaches: -par_environment_too_big_zsh env_parallel: Error: 1. Run 'env_parallel --session' before you set -par_environment_too_big_zsh env_parallel: Error: variables or define functions. -par_environment_too_big_zsh env_parallel: Error: 2. Use --env and only mention the names to copy. -par_environment_too_big_zsh env_parallel: Error: 3. Try running this in a clean environment once: -par_environment_too_big_zsh env_parallel: Error: env_parallel --record-env -par_environment_too_big_zsh env_parallel: Error: And then use '--env _' -par_environment_too_big_zsh env_parallel: Error: For details see: man env_parallel -par_environment_too_big_zsh _which_PAR:999: argument list too long: perl -par_environment_too_big_zsh env_parallel: Error: Your environment is too big. -par_environment_too_big_zsh env_parallel: Error: You can try 3 different approaches: -par_environment_too_big_zsh env_parallel: Error: 1. Run 'env_parallel --session' before you set -par_environment_too_big_zsh env_parallel: Error: variables or define functions. -par_environment_too_big_zsh env_parallel: Error: 2. Use --env and only mention the names to copy. -par_environment_too_big_zsh env_parallel: Error: 3. Try running this in a clean environment once: -par_environment_too_big_zsh env_parallel: Error: env_parallel --record-env -par_environment_too_big_zsh env_parallel: Error: And then use '--env _' -par_environment_too_big_zsh env_parallel: Error: For details see: man env_parallel -par_environment_too_big_zsh _which_PAR:999: argument list too long: perl -par_environment_too_big_zsh env_parallel: Error: Your environment is too big. -par_environment_too_big_zsh env_parallel: Error: You can try 3 different approaches: -par_environment_too_big_zsh env_parallel: Error: 1. Run 'env_parallel --session' before you set -par_environment_too_big_zsh env_parallel: Error: variables or define functions. -par_environment_too_big_zsh env_parallel: Error: 2. Use --env and only mention the names to copy. -par_environment_too_big_zsh env_parallel: Error: 3. Try running this in a clean environment once: -par_environment_too_big_zsh env_parallel: Error: env_parallel --record-env -par_environment_too_big_zsh env_parallel: Error: And then use '--env _' -par_environment_too_big_zsh env_parallel: Error: For details see: man env_parallel -par_environment_too_big_zsh _which_PAR:999: argument list too long: perl -par_environment_too_big_zsh env_parallel: Error: Your environment is too big. -par_environment_too_big_zsh env_parallel: Error: You can try 3 different approaches: -par_environment_too_big_zsh env_parallel: Error: 1. Run 'env_parallel --session' before you set -par_environment_too_big_zsh env_parallel: Error: variables or define functions. -par_environment_too_big_zsh env_parallel: Error: 2. Use --env and only mention the names to copy. -par_environment_too_big_zsh env_parallel: Error: 3. Try running this in a clean environment once: -par_environment_too_big_zsh env_parallel: Error: env_parallel --record-env -par_environment_too_big_zsh env_parallel: Error: And then use '--env _' -par_environment_too_big_zsh env_parallel: Error: For details see: man env_parallel -par_environment_too_big_zsh _which_PAR:999: argument list too long: perl -par_environment_too_big_zsh env_parallel: Error: Your environment is too big. -par_environment_too_big_zsh env_parallel: Error: You can try 3 different approaches: -par_environment_too_big_zsh env_parallel: Error: 1. Run 'env_parallel --session' before you set -par_environment_too_big_zsh env_parallel: Error: variables or define functions. -par_environment_too_big_zsh env_parallel: Error: 2. Use --env and only mention the names to copy. -par_environment_too_big_zsh env_parallel: Error: 3. Try running this in a clean environment once: -par_environment_too_big_zsh env_parallel: Error: env_parallel --record-env -par_environment_too_big_zsh env_parallel: Error: And then use '--env _' -par_environment_too_big_zsh env_parallel: Error: For details see: man env_parallel -par_environment_too_big_zsh _which_PAR:999: argument list too long: perl -par_environment_too_big_zsh env_parallel: Error: Your environment is too big. -par_environment_too_big_zsh env_parallel: Error: You can try 3 different approaches: -par_environment_too_big_zsh env_parallel: Error: 1. Run 'env_parallel --session' before you set -par_environment_too_big_zsh env_parallel: Error: variables or define functions. -par_environment_too_big_zsh env_parallel: Error: 2. Use --env and only mention the names to copy. -par_environment_too_big_zsh env_parallel: Error: 3. Try running this in a clean environment once: -par_environment_too_big_zsh env_parallel: Error: env_parallel --record-env -par_environment_too_big_zsh env_parallel: Error: And then use '--env _' -par_environment_too_big_zsh env_parallel: Error: For details see: man env_parallel -par_environment_too_big_zsh _which_PAR:999: argument list too long: perl -par_environment_too_big_zsh env_parallel: Error: Your environment is too big. -par_environment_too_big_zsh env_parallel: Error: You can try 3 different approaches: -par_environment_too_big_zsh env_parallel: Error: 1. Run 'env_parallel --session' before you set -par_environment_too_big_zsh env_parallel: Error: variables or define functions. -par_environment_too_big_zsh env_parallel: Error: 2. Use --env and only mention the names to copy. -par_environment_too_big_zsh env_parallel: Error: 3. Try running this in a clean environment once: -par_environment_too_big_zsh env_parallel: Error: env_parallel --record-env -par_environment_too_big_zsh env_parallel: Error: And then use '--env _' -par_environment_too_big_zsh env_parallel: Error: For details see: man env_parallel +par_environment_too_big_zsh parallel: Error: Command line too long (999 >= 999) at input 0: fail_bigvar +par_environment_too_big_zsh parallel: Error: Command line too long (999 >= 999) at input 0: fail_bigvar_remote +par_environment_too_big_zsh parallel: Error: Command line too long (999 >= 999) at input 0: fail_bigvar_quote +par_environment_too_big_zsh parallel: Error: Command line too long (999 >= 999) at input 0: fail_bigvar_quote_remote +par_environment_too_big_zsh parallel: Error: Command line too long (999 >= 999) at input 0: fail_bigfunc +par_environment_too_big_zsh parallel: Error: Command line too long (999 >= 999) at input 0: fail_bigfunc_remote +par_environment_too_big_zsh parallel: Error: Command line too long (999 >= 999) at input 0: fail_bigfunc_quote +par_environment_too_big_zsh parallel: Error: Command line too long (999 >= 999) at input 0: fail_bigfunc_quote_remote par_funky_ash par_funky_ash ' ' par_funky_ash ' par_funky_ash  !"#$%&'"'"'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~' diff --git a/testsuite/wanted-results/parallel-local-ssh8 b/testsuite/wanted-results/parallel-local-ssh8 index 06c64cb0..03f6c668 100644 --- a/testsuite/wanted-results/parallel-local-ssh8 +++ b/testsuite/wanted-results/parallel-local-ssh8 @@ -34,6 +34,7 @@ par_path_remote_csh StArT par_path_remote_csh CSH Path before: /bin:/usr/bin with no parallel par_path_remote_csh parallel: Command not found. par_path_remote_csh ^^^^^^^^ Not found is OK +par_path_remote_csh parallel: Warning: Could not figure out number of cpus on lo (). Using 1. par_path_remote_csh /bin:/usr/bin:/tmp OK par_path_remote_csh Done par_retries_1 ### Test of --retries - it should run 13 jobs in total diff --git a/testsuite/wanted-results/parallel-local-ssh9 b/testsuite/wanted-results/parallel-local-ssh9 index c5603a4a..31807a44 100644 --- a/testsuite/wanted-results/parallel-local-ssh9 +++ b/testsuite/wanted-results/parallel-local-ssh9 @@ -29,11 +29,9 @@ par__propagate_env ** test_zsh_filter par__propagate_env FOO=test_zsh_filter par__propagate_env HOME=~ par__propagate_env ** test_csh -par__propagate_env MANPATH: Undefined variable. par__propagate_env FOO=test_csh par__propagate_env HOME=~ par__propagate_env ** test_csh_filter -par__propagate_env MANPATH: Undefined variable. par__propagate_env FOO=test_csh_filter par__propagate_env HOME=~ par__propagate_env ** bug #41805 done diff --git a/testsuite/wanted-results/parallel-macos b/testsuite/wanted-results/parallel-macos index b621a2fe..86bd3d1d 100644 --- a/testsuite/wanted-results/parallel-macos +++ b/testsuite/wanted-results/parallel-macos @@ -1,13 +1,15 @@ -par_big_func 1 3XXX 90XXX -par_big_func 1 3XXX 90XXX -par_big_func 1 3XXX 90XXX -par_big_func 1 2XXX 48XXX -par_big_func_name 18XXX -par_big_func_name 18XXX -par_big_func_name 18XXX -par_big_func_name 18XXX -par_big_func_name 18XXX -par_big_func_name 18XXX +par_big_func 1 3XXX 91XXX +par_big_func 1 3XXX 91XXX +par_big_func 1 3XXX 91XXX +par_big_func 1 1XXX 46XXX +par_big_func +par_big_func_name 19XXX +par_big_func_name 19XXX +par_big_func_name 19XXX +par_big_func_name 19XXX +par_big_func_name 19XXX +par_big_func_name 19XXX +par_big_func_name par_big_var_func_name 18XXX par_big_var_func_name 18XXX par_big_var_func_name 18XXX @@ -25,50 +27,30 @@ par_big_var_func_name 18XXX par_big_var_func_name 18XXX par_big_var_func_name 18XXX par_big_var_func_name 18XXX -par_many_args 1 2XXX 5XXX -par_many_args 1 2XXX 5XXX -par_many_args 1 2XXX 5XXX -par_many_args 1 2XXX 5XXX -par_many_args 1 2XXX 5XXX -par_many_args 1 2XXX 5XXX -par_many_args 1 2XXX 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 184 4XXX -par_many_func 1 44 1XXX +par_big_var_func_name 1XXX +par_big_var_func_name +par_many_args 1 3XXX 6XXX +par_many_args 1 3XXX 6XXX +par_many_args 1 3XXX 6XXX +par_many_args 1 3XXX 6XXX +par_many_args 1 3XXX 6XXX +par_many_args 1 3XXX 6XXX +par_many_args 1 1XXX 3XXX +par_many_args +par_many_func 1 580 13XXX +par_many_func 1 580 13XXX +par_many_func 1 580 13XXX +par_many_func 1 580 13XXX +par_many_func 1 580 13XXX +par_many_func 1 580 13XXX +par_many_func 1 580 13XXX +par_many_func 1 580 13XXX +par_many_func 1 580 13XXX +par_many_func 1 580 13XXX +par_many_func 1 580 13XXX +par_many_func 1 288 6XXX +par_many_func +par_many_func par_many_var 22XXX par_many_var 22XXX par_many_var 22XXX @@ -76,6 +58,7 @@ par_many_var 22XXX par_many_var 22XXX par_many_var 22XXX par_many_var 22XXX +par_many_var par_many_var_big_func 5XXX par_many_var_big_func 5XXX par_many_var_big_func 5XXX @@ -105,7 +88,15 @@ par_many_var_big_func 5XXX par_many_var_big_func 5XXX par_many_var_big_func 5XXX par_many_var_big_func 5XXX -par_many_var_big_func 5XXX -par_many_var_func 1 2XXX 58XXX -par_many_var_func 1 2XXX 58XXX -par_many_var_func 1 1XXX 43XXX +par_many_var_big_func +par_many_var_func 1 740 17XXX +par_many_var_func 1 740 17XXX +par_many_var_func 1 740 17XXX +par_many_var_func 1 740 17XXX +par_many_var_func 1 740 17XXX +par_many_var_func 1 740 17XXX +par_many_var_func 1 740 17XXX +par_many_var_func 1 740 17XXX +par_many_var_func 1 740 17XXX +par_many_var_func 1 8 164 +par_many_var_func diff --git a/testsuite/wanted-results/parallel-remote1 b/testsuite/wanted-results/parallel-remote1 index 49e385d0..5456c5ee 100644 --- a/testsuite/wanted-results/parallel-remote1 +++ b/testsuite/wanted-results/parallel-remote1 @@ -115,9 +115,10 @@ par_special_ssh 98 par_special_ssh 99 par_special_ssh 100 par_timeout_retries ### test --timeout --retries +par_timeout_retries ssh: connect to host 192.168.1.197 port 22: No route to host par_timeout_retries par_timeout_retries parallel: Warning: This job was killed because it timed out: -par_timeout_retries parallel: Warning: ssh 192.168.1.197 echo 192.168.1.197 par_timeout_retries parallel: Warning: ssh 8.8.8.8 echo 8.8.8.8 +par_timeout_retries parallel: Warning: ssh 8.8.8.9 echo 8.8.8.9 par_timeout_retries vagrant@parallel-server1 par_timeout_retries vagrant@parallel-server2 par_timeout_retries vagrant@parallel-server3 diff --git a/testsuite/wanted-results/sql01 b/testsuite/wanted-results/sql01 index c06520c7..cc09d1d8 100644 --- a/testsuite/wanted-results/sql01 +++ b/testsuite/wanted-results/sql01 @@ -89,5 +89,5 @@ par_sql_on_cmdline ### Test reading sql on command line par_sql_on_cmdline Test reading SQL from command line par_sql_on_cmdline Yes it does par_tablesize ### Test --table-size --tablesize -par_tablesize 93 -par_tablesize 93 +par_tablesize 94 +par_tablesize 94 diff --git a/testsuite/wanted-results/sql02 b/testsuite/wanted-results/sql02 index 21b910af..c4a98499 100644 --- a/testsuite/wanted-results/sql02 +++ b/testsuite/wanted-results/sql02 @@ -8,8 +8,7 @@ par_influx name: databases par_influx name par_influx ---- par_influx _internal -par_influx mydb -par_influx myinflux +par_influx tange par_influx parallel par_influx name: cpu par_influx time host region value