From b8647a2c467f863cfa94c2dc424c604d385eddf5 Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Mon, 25 Sep 2023 00:07:47 +0200 Subject: [PATCH] Released as 20230922 ('Derna') --- Makefile.am | 2 + Makefile.in | 2 + NEWS | 15 +++ README | 24 ++-- configure | 20 +-- configure.ac | 2 +- doc/release_new_version | 12 +- packager/obs/Makefile | 4 + packager/obs/home-tange/parallel/.osc/_files | 15 ++- .../home-tange/parallel/.osc/parallel.spec | 2 +- src/env_parallel.ash | 2 +- src/env_parallel.bash | 2 +- src/env_parallel.dash | 2 +- src/env_parallel.ksh | 2 +- src/env_parallel.mksh | 2 +- src/env_parallel.sh | 2 +- src/env_parallel.zsh | 2 +- src/niceload | 2 +- src/parallel | 22 ++-- src/parallel.pod | 20 +-- src/parsort | 2 +- src/sql | 2 +- testsuite/tests-to-run/parallel-centos3.sh | 8 +- testsuite/tests-to-run/parallel-freebsd.sh | 2 +- testsuite/tests-to-run/sql01.sh | 4 +- testsuite/wanted-results/parallel-local21 | 6 + testsuite/wanted-results/parallel-macos | 115 ++++++------------ 27 files changed, 146 insertions(+), 149 deletions(-) diff --git a/Makefile.am b/Makefile.am index 35c31e49..f22cbd93 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,8 @@ test: web: cd src; make web + cp -r src/*.pdf src/sphinx/build/html/* ../parallel-web/parallel + cp ../parallel-web/parallel/parallel.html ../parallel-web/parallel/man.html upload: eval `gpg-agent --daemon` diff --git a/Makefile.in b/Makefile.in index c82c5b50..46fb62f5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -778,6 +778,8 @@ test: web: cd src; make web + cp -r src/*.pdf src/sphinx/build/html/* ../parallel-web/parallel + cp ../parallel-web/parallel/parallel.html ../parallel-web/parallel/man.html upload: eval `gpg-agent --daemon` diff --git a/NEWS b/NEWS index ed82186d..68ae8148 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,18 @@ +20230922 + +New in this release: + +* Bug fixes and man page updates. + +News about GNU Parallel: + +* This CLI Tool is AMAZING | Prime Reacts + https://www.youtube.com/watch?v=ry49BZA-tgg + +* New Data Engineering Stack - GNU parallel + https://www.linkedin.com/feed/update/urn:li:activity:7100509073149743104?updateEntityUrn=urn%3Ali%3Afs_feedUpdate%3A%28V2%2Curn%3Ali%3Aactivity%3A7100509073149743104%29 + + 20230822 New in this release: diff --git a/README b/README index ca374ff7..3889e125 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-20230822.tar.bz2 - wget https://ftpmirror.gnu.org/parallel/parallel-20230822.tar.bz2.sig - gpg parallel-20230822.tar.bz2.sig - bzip2 -dc parallel-20230822.tar.bz2 | tar xvf - - cd parallel-20230822 + wget https://ftpmirror.gnu.org/parallel/parallel-20230922.tar.bz2 + wget https://ftpmirror.gnu.org/parallel/parallel-20230922.tar.bz2.sig + gpg parallel-20230922.tar.bz2.sig + bzip2 -dc parallel-20230922.tar.bz2 | tar xvf - + cd parallel-20230922 ./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-20230822.tar.bz2 - wget https://ftpmirror.gnu.org/parallel/parallel-20230822.tar.bz2.sig - gpg parallel-20230822.tar.bz2.sig - bzip2 -dc parallel-20230822.tar.bz2 | tar xvf - - cd parallel-20230822 + wget https://ftpmirror.gnu.org/parallel/parallel-20230922.tar.bz2 + wget https://ftpmirror.gnu.org/parallel/parallel-20230922.tar.bz2.sig + gpg parallel-20230922.tar.bz2.sig + bzip2 -dc parallel-20230922.tar.bz2 | tar xvf - + cd parallel-20230922 ./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. (2023, August 22). GNU Parallel 20230822 ('Chandrayaan'). - Zenodo. https://doi.org/10.5281/zenodo.8278274 + Tange, O. (2023, September 22). GNU Parallel 20230922 ('Derna'). + Zenodo. https://doi.org/10.5281/zenodo.8374296 Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. diff --git a/configure b/configure index 6d93d26b..13a0ff4a 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 20230822. +# Generated by GNU Autoconf 2.71 for parallel 20230922. # # Report bugs to . # @@ -610,8 +610,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='parallel' PACKAGE_TARNAME='parallel' -PACKAGE_VERSION='20230822' -PACKAGE_STRING='parallel 20230822' +PACKAGE_VERSION='20230922' +PACKAGE_STRING='parallel 20230922' 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 20230822 to adapt to many kinds of systems. +\`configure' configures parallel 20230922 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 20230822:";; + short | recursive ) echo "Configuration of parallel 20230922:";; 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 20230822 +parallel configure 20230922 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 20230822, which was +It was created by parallel $as_me 20230922, 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='20230822' + VERSION='20230922' 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 20230822, which was +This file was extended by parallel $as_me 20230922, 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 20230822 +parallel config.status 20230922 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 0569f1fd..3770d7f5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([parallel],[20230822],[bug-parallel@gnu.org]) +AC_INIT([parallel],[20230922],[bug-parallel@gnu.org]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([ diff --git a/doc/release_new_version b/doc/release_new_version index 45b31a17..988644c9 100644 --- a/doc/release_new_version +++ b/doc/release_new_version @@ -264,14 +264,14 @@ from:tange@gnu.org to:parallel@gnu.org, bug-parallel@gnu.org stable-bcc: Jesse Alama -Subject: GNU Parallel 20230922 ('Derna/Korankrise/Barbie/Woman Life Freedom') released [stable] +Subject: GNU Parallel 20230922 ('Derna') released [stable] -GNU Parallel 20230822 ('Chandrayaan') has been released. It is available for download at: lbry://@GnuParallel:4 +GNU Parallel 20230922 ('Derna') has been released. It is available for download at: lbry://@GnuParallel:4 Quote of the month: - GNU parallel is your friend. Unleash your cores! #GNU - -- Blake L @BlakeDL@twitter + Parallel is so damn good! You’ve got to use it. + -- @ThePrimeTimeagen@youtube.com New in this release: @@ -279,9 +279,9 @@ New in this release: News about GNU Parallel: -* GNU Parallel, where have you been all my life? https://alexplescan.com/posts/2023/08/20/gnu-parallel/ +* This CLI Tool is AMAZING | Prime Reacts https://www.youtube.com/watch?v=ry49BZA-tgg -* Parallel (multithreaded) music download from Youtube https://hrna.moe/?p=parallel-multithread-music-download +* New Data Engineering Stack - GNU parallel https://www.linkedin.com/feed/update/urn:li:activity:7100509073149743104?updateEntityUrn=urn%3Ali%3Afs_feedUpdate%3A%28V2%2Curn%3Ali%3Aactivity%3A7100509073149743104%29 GNU Parallel - For people who live life in the parallel lane. diff --git a/packager/obs/Makefile b/packager/obs/Makefile index 4151727f..1fcb7949 100644 --- a/packager/obs/Makefile +++ b/packager/obs/Makefile @@ -4,7 +4,11 @@ all: osc rm home-tange/parallel/parallel_*.dsc || true cp ../debian/parallel_*.dsc ../debian/parallel_*.tar.gz home-tange/parallel/ cp `ls ../../parallel-2*.tar.bz2|grep -v latest|tail -n1` home-tange/parallel/ + cp `ls ../../parallel-2*.tar.bz2.sig|grep -v latest|tail -n1` home-tange/parallel/ perl -i -pe '/Version:/ and s/20\d\d\d\d\d\d/$$ENV{YYYYMMDD}/g' home-tange/parallel/parallel.spec + cd home-tange/parallel && make + +dummy: # Update sha256sum cd home-tange/parallel && s=`sha256sum parallel-*.tar.bz2|field 1` perl -i -pe 's/(sha256sums=..)\w+(..)/$$1$$ENV{s}$$2/' PKGBUILD # Update version diff --git a/packager/obs/home-tange/parallel/.osc/_files b/packager/obs/home-tange/parallel/.osc/_files index b6307ae2..ffdb1bd5 100644 --- a/packager/obs/home-tange/parallel/.osc/_files +++ b/packager/obs/home-tange/parallel/.osc/_files @@ -1,7 +1,10 @@ - - - - - - + + + + + + + + + diff --git a/packager/obs/home-tange/parallel/.osc/parallel.spec b/packager/obs/home-tange/parallel/.osc/parallel.spec index 4c77e625..3f56d1a2 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: 20230822 +Version: 20230922 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 af9fdabc..3ade4eef 100755 --- a/src/env_parallel.ash +++ b/src/env_parallel.ash @@ -393,7 +393,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20230822 (GNU parallel `parallel --minversion 1`)" + echo "parset 20230922 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2023 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 2ed07ef4..ee92064d 100755 --- a/src/env_parallel.bash +++ b/src/env_parallel.bash @@ -395,7 +395,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20230822 (GNU parallel `parallel --minversion 1`)" + echo "parset 20230922 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2023 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 e5ac08c6..fc580a7f 100755 --- a/src/env_parallel.dash +++ b/src/env_parallel.dash @@ -393,7 +393,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20230822 (GNU parallel `parallel --minversion 1`)" + echo "parset 20230922 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2023 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 b2673067..7739e7e9 100755 --- a/src/env_parallel.ksh +++ b/src/env_parallel.ksh @@ -376,7 +376,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20230822 (GNU parallel `parallel --minversion 1`)" + echo "parset 20230922 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2023 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 4fadc174..1e016b98 100644 --- a/src/env_parallel.mksh +++ b/src/env_parallel.mksh @@ -378,7 +378,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20230822 (GNU parallel `parallel --minversion 1`)" + echo "parset 20230922 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2023 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 f8db4e44..55d52129 100755 --- a/src/env_parallel.sh +++ b/src/env_parallel.sh @@ -393,7 +393,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20230822 (GNU parallel `parallel --minversion 1`)" + echo "parset 20230922 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2023 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 c55715f5..92ff5a93 100755 --- a/src/env_parallel.zsh +++ b/src/env_parallel.zsh @@ -368,7 +368,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20230822 (GNU parallel `parallel --minversion 1`)" + echo "parset 20230922 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2023 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 47a35608..3085b878 100755 --- a/src/niceload +++ b/src/niceload @@ -26,7 +26,7 @@ use strict; use Getopt::Long; $Global::progname="niceload"; -$Global::version = 20230822; +$Global::version = 20230922; 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 60bec7cf..b2dba641 100755 --- a/src/parallel +++ b/src/parallel @@ -2800,7 +2800,7 @@ sub check_invalid_option_combinations() { sub init_globals() { # Defaults: - $Global::version = 20230822; + $Global::version = 20230922; $Global::progname = 'parallel'; $::name = "GNU Parallel"; $Global::infinity = 2**31; @@ -5761,8 +5761,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. (2023, August 22). GNU Parallel 20230822 ('Chandrayaan').", - " Zenodo. https://doi.org/10.5281/zenodo.8278274", + " Tange, O. (2023, September 22). GNU Parallel 20230922 ('Derna').", + " Zenodo. https://doi.org/10.5281/zenodo.8374296", "", # Before changing these lines, please read # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice @@ -5794,8 +5794,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. (2023, August 22). GNU Parallel 20230822 ('Chandrayaan').", - " Zenodo. https://doi.org/10.5281/zenodo.8278274", + " Tange, O. (2023, September 22). GNU Parallel 20230922 ('Derna').", + " Zenodo. https://doi.org/10.5281/zenodo.8374296", "", # Before changing these line, please read # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice and @@ -5922,20 +5922,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_2023_8278274,", + "\@software{tange_2023_8374296,", " author = {Tange, Ole},", - " title = {GNU Parallel 20230822 ('Chandrayaan')},", - " month = Aug,", + " title = {GNU Parallel 20230922 ('Derna')},", + " month = Sep,", " 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.8278274},", - " url = {https://doi.org/10.5281/zenodo.8278274}", + " doi = {10.5281/zenodo.8374296},", + " url = {https://doi.org/10.5281/zenodo.8374296}", "}", "", - "(Feel free to use \\nocite{tange_2023_8278274})", + "(Feel free to use \\nocite{tange_2023_8374296})", "", # 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 35440892..70677dfa 100644 --- a/src/parallel.pod +++ b/src/parallel.pod @@ -398,25 +398,25 @@ Skip this job (see also B<--filter>). Example: parallel echo '{= $arg[1] >= $arg[2] and skip =}' \ ::: 1 2 3 ::: 2 3 4 -=item Z<> B (beta testing) +=item Z<> B -=item Z<> B (beta testing) +=item Z<> B -=item Z<> B (beta testing) +=item Z<> B -=item Z<> B (beta testing) +=item Z<> B -=item Z<> B (beta testing) +=item Z<> B -=item Z<> B (beta testing) +=item Z<> B -=item Z<> B (beta testing) +=item Z<> B -=item Z<> B (beta testing) +=item Z<> B -=item Z<> B (beta testing) +=item Z<> B -=item Z<> B (beta testing) +=item Z<> B Time functions. I is number of seconds since epoch. If left out it will use current local time. Example: diff --git a/src/parsort b/src/parsort index db6cfbe6..693c9831 100755 --- a/src/parsort +++ b/src/parsort @@ -137,7 +137,7 @@ GetOptions( "help" => \$opt::dummy, ) || exit(255); $Global::progname = ($0 =~ m:(^|/)([^/]+)$:)[1]; -$Global::version = 20230822; +$Global::version = 20230922; 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 b998e955..6c10ac4d 100755 --- a/src/sql +++ b/src/sql @@ -670,7 +670,7 @@ $Global::Initfile && unlink $Global::Initfile; exit ($err); sub parse_options { - $Global::version = 20230822; + $Global::version = 20230922; $Global::progname = 'sql'; # This must be done first as this may exec myself diff --git a/testsuite/tests-to-run/parallel-centos3.sh b/testsuite/tests-to-run/parallel-centos3.sh index 43ed85d2..985bee76 100644 --- a/testsuite/tests-to-run/parallel-centos3.sh +++ b/testsuite/tests-to-run/parallel-centos3.sh @@ -33,10 +33,10 @@ start_centos3() { # Vagrant does not set the IP addr # cd to the centos3 dir with the Vagrantfile # Try different "cd"s as the script may be started from another dir - cd $testsuitedir/vagrant/tange/centos3/ 2>/dev/null - cd testsuite/vagrant/tange/centos3/ 2>/dev/null - cd vagrant/tange/centos3/ 2>/dev/null - cd ../vagrant/tange/centos3/ 2>/dev/null + cd $testsuitedir/vagrant/FritsHoogland/centos3/ 2>/dev/null + cd testsuite/vagrant/FritsHoogland/centos3/ 2>/dev/null + cd vagrant/FritsHoogland/centos3/ 2>/dev/null + cd ../vagrant/FritsHoogland/centos3/ 2>/dev/null vagrantssh() { port=$(perl -ne '/#/ and next; /config.vm.network.*host:\s*(\d+)/ and print $1' Vagrantfile) w4it-for-port-open localhost $port diff --git a/testsuite/tests-to-run/parallel-freebsd.sh b/testsuite/tests-to-run/parallel-freebsd.sh index fa95916e..73003389 100644 --- a/testsuite/tests-to-run/parallel-freebsd.sh +++ b/testsuite/tests-to-run/parallel-freebsd.sh @@ -105,7 +105,7 @@ unset TMPDIR # We can safely ignore those. export LC_ALL=C -PARALLEL_SHELL=sh env_parallel --env _ -vj9 -k --joblog /tmp/jl-`basename $0` --retries 3 \ +PARALLEL_SHELL=sh env_parallel --timeout 100 --env _ -vj9 -k --joblog /tmp/jl-`basename $0` --retries 3 \ -S $SSHLOGIN1 --tag '{} 2>&1' \ ::: $(compgen -A function | grep par_ | sort) \ 2> >(grep -Ev 'shopt: not found|declare: not found') diff --git a/testsuite/tests-to-run/sql01.sh b/testsuite/tests-to-run/sql01.sh index 68e85210..02cc6753 100755 --- a/testsuite/tests-to-run/sql01.sh +++ b/testsuite/tests-to-run/sql01.sh @@ -50,7 +50,7 @@ par_sql_on_cmdline() { par_read_sql_from_file() { echo '### Test reading sql from file' unittest=/tmp/unittest.sql - cat >"$unittest.sql" <"$unittest" <&1' + parallel --timeout 3000% -j6 --tag -k --joblog /tmp/jl-`basename $0` '{} 2>&1' diff --git a/testsuite/wanted-results/parallel-local21 b/testsuite/wanted-results/parallel-local21 index a950e8f5..f9e92de3 100644 --- a/testsuite/wanted-results/parallel-local21 +++ b/testsuite/wanted-results/parallel-local21 @@ -100,8 +100,14 @@ par_shebang_wrap_nodejs Arguments [ 'arg1' ] par_shebang_wrap_nodejs Arguments [ 'arg2' ] par_shebang_wrap_nodejs Arguments [ 'arg3.1 arg3.2' ] par_shebang_wrap_octave Arguments arg1 +par_shebang_wrap_octave octave: X11 DISPLAY environment variable not set +par_shebang_wrap_octave octave: disabling GUI features par_shebang_wrap_octave Arguments arg2 +par_shebang_wrap_octave octave: X11 DISPLAY environment variable not set +par_shebang_wrap_octave octave: disabling GUI features par_shebang_wrap_octave Arguments arg3.1 arg3.2 +par_shebang_wrap_octave octave: X11 DISPLAY environment variable not set +par_shebang_wrap_octave octave: disabling GUI features par_shebang_wrap_perl Arguments arg1 par_shebang_wrap_perl Arguments arg2 par_shebang_wrap_perl Arguments arg3.1 arg3.2 diff --git a/testsuite/wanted-results/parallel-macos b/testsuite/wanted-results/parallel-macos index 252fa68f..ef9ed259 100644 --- a/testsuite/wanted-results/parallel-macos +++ b/testsuite/wanted-results/parallel-macos @@ -1,79 +1,46 @@ -par_big_func 1 3XXX 90XXX -par_big_func 1 3XXX 90XXX -par_big_func 1 3XXX 90XXX -par_big_func 1 1XXX 47XXX -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_var_func_name 18XXX -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_big_var_func_name 18XXX -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_big_var_func_name 18XXX -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_big_var_func_name 18XXX -par_big_var_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_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_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 196 4XXX -par_many_func 1 4 68 -par_many_var 22XXX -par_many_var 22XXX -par_many_var 22XXX -par_many_var 22XXX -par_many_var 22XXX -par_many_var 22XXX -par_many_var 22XXX +par_many_args 1 1XXX 2XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 212 5XXX +par_many_func 1 96 2XXX par_many_var_big_func 5XXX par_many_var_big_func 5XXX par_many_var_big_func 5XXX @@ -101,8 +68,6 @@ 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_big_func 5XXX -par_many_var_func 1 2XXX 58XXX -par_many_var_func 1 2XXX 58XXX -par_many_var_func 1 1XXX 42XXX +par_many_var_func 1 2XXX 59XXX +par_many_var_func 1 2XXX 59XXX +par_many_var_func 1 1XXX 41XXX