From 6554437a7290b07a129c4ea3a80389d1c636b351 Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Mon, 16 Oct 2023 13:47:02 +0200 Subject: [PATCH] Released as 20231022 ('Al-Aqsa Deluge') --- NEWS | 15 ++ README | 24 +-- configure | 20 +-- configure.ac | 2 +- doc/haikus | 7 +- doc/release_new_version | 32 ++-- packager/obs/Makefile | 41 ++---- packager/obs/home-tange/parallel/.osc/_files | 18 +-- .../obs/home-tange/parallel/.osc/parallel.spec | 2 +- packager/obs/home-tange/parallel/Makefile | 22 +++ 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 | 2 + src/parallel_alternatives.pod | 163 +++++++++++++++++++-- src/parallel_tutorial.pod | 13 +- src/parsort | 2 +- src/sql | 2 +- testsuite/tests-to-run/parallel-freebsd.sh | 2 +- testsuite/tests-to-run/parallel-local-10s.sh | 21 +-- testsuite/tests-to-run/parallel-local-30s.sh | 19 +++ testsuite/tests-to-run/parallel-local-ssh7.sh | 2 +- testsuite/tests-to-run/sql01.sh | 19 ++- .../vagrant/FritsHoogland/centos3/Vagrantfile | 4 + .../FritsHoogland/centos39-oracle817/Vagrantfile | 4 + testsuite/vagrant/generic/freebsd13/Vagrantfile | 4 + testsuite/wanted-results/parallel-local-10s | 6 - testsuite/wanted-results/parallel-local-30s | 5 + testsuite/wanted-results/parallel-tutorial | 8 +- testsuite/wanted-results/sql01 | 8 +- 36 files changed, 342 insertions(+), 163 deletions(-) rewrite packager/obs/Makefile (74%) rewrite packager/obs/home-tange/parallel/.osc/_files (98%) create mode 100644 packager/obs/home-tange/parallel/Makefile diff --git a/NEWS b/NEWS index 68ae8148..1b212960 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,18 @@ +20231022 + +New in this release: + +* Bug fixes and man page updates. + +News about GNU Parallel: + +* Resume long parallel jobs + https://ginolhac.github.io/posts/2023-10-02_resume-parallel/index.html + +* Efficiency and Speed with GNU Parallel + https://dev.to/0xog_pg/efficiency-and-speed-with-gnu-parallel-loo + + 20230922 New in this release: diff --git a/README b/README index 3889e125..464a39da 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-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 + wget https://ftpmirror.gnu.org/parallel/parallel-20231022.tar.bz2 + wget https://ftpmirror.gnu.org/parallel/parallel-20231022.tar.bz2.sig + gpg parallel-20231022.tar.bz2.sig + bzip2 -dc parallel-20231022.tar.bz2 | tar xvf - + cd parallel-20231022 ./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-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 + wget https://ftpmirror.gnu.org/parallel/parallel-20231022.tar.bz2 + wget https://ftpmirror.gnu.org/parallel/parallel-20231022.tar.bz2.sig + gpg parallel-20231022.tar.bz2.sig + bzip2 -dc parallel-20231022.tar.bz2 | tar xvf - + cd parallel-20231022 ./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, September 22). GNU Parallel 20230922 ('Derna'). - Zenodo. https://doi.org/10.5281/zenodo.8374296 + Tange, O. (2023, October 22). GNU Parallel 20231022 ('Al-Aqsa Deluge'). + Zenodo. https://doi.org/10.5281/zenodo.10035562 Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. diff --git a/configure b/configure index 13a0ff4a..57bfe80b 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 20230922. +# Generated by GNU Autoconf 2.71 for parallel 20231022. # # Report bugs to . # @@ -610,8 +610,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='parallel' PACKAGE_TARNAME='parallel' -PACKAGE_VERSION='20230922' -PACKAGE_STRING='parallel 20230922' +PACKAGE_VERSION='20231022' +PACKAGE_STRING='parallel 20231022' 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 20230922 to adapt to many kinds of systems. +\`configure' configures parallel 20231022 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 20230922:";; + short | recursive ) echo "Configuration of parallel 20231022:";; 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 20230922 +parallel configure 20231022 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 20230922, which was +It was created by parallel $as_me 20231022, 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='20230922' + VERSION='20231022' 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 20230922, which was +This file was extended by parallel $as_me 20231022, 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 20230922 +parallel config.status 20231022 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 3770d7f5..184620c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([parallel],[20230922],[bug-parallel@gnu.org]) +AC_INIT([parallel],[20231022],[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 da05615c..4eee4dbd 100644 --- a/doc/haikus +++ b/doc/haikus @@ -7,10 +7,6 @@ Quote of the month: GNU parallel ftw -- hostux.social/@rmpr @_paulmairo@twitter - Love to make a dual processor workstation absolutely whir running dozens of analysis scripts at once - -- Best Catboy Key Grip @alamogordoglass@twitter - - --line-buffer, a flag parallel, now more precise Output is in sync @@ -219,6 +215,9 @@ https://negfeedback.blogspot.com/2020/05/indispensable-command-line-tools.html === Used === + Love to make a dual processor workstation absolutely whir running dozens of analysis scripts at once + -- Best Catboy Key Grip @alamogordoglass@twitter + GNU parallel is your friend. Unleash your cores! #GNU -- Blake L @BlakeDL@twitter diff --git a/doc/release_new_version b/doc/release_new_version index 988644c9..24dfe102 100644 --- a/doc/release_new_version +++ b/doc/release_new_version @@ -24,22 +24,32 @@ With the same things that goes in the announce mail Start termux on Android Start: wssh mac ping fi.dk niceload --prg firefox & -cd testsuite; make mem; make polar; make long; make short +cd testsuite; +# With 23 GB RAM free this takes 3m43s +make mem; +make polar; +# Estimated time: 13m +make long +# Estimated time: 42m +make short == Update version == https://zenodo.org/deposit/new -(*) Software +Do you already have a DOI for this upload? No (Reserve DOI) +Resource type: Software GNU Parallel 20xxxx22 ('Xxxx') +Add creator: Person Tange, Ole https://orcid.org/0000-0002-6345-1437 +Role: Contact person Description GNU Parallel is a general parallelizer to run multiple serial command line programs in parallel without changing them. License: -gpl v3 +gpl [Save] @@ -79,7 +89,7 @@ make alphaupload cd ~/privat/parallel/packager/obs find home-tange/parallel/* -type f | - grep -Ev '(PKGBUILD|parallel.spec)' | + grep -Ev '(PKGBUILD|parallel.spec|Makefile)' | parallel -j1 'osc rm {} || rm {}' # This should not create new files osc up home-tange/parallel/ @@ -264,24 +274,24 @@ from:tange@gnu.org to:parallel@gnu.org, bug-parallel@gnu.org stable-bcc: Jesse Alama -Subject: GNU Parallel 20230922 ('Derna') released [stable] +Subject: GNU Parallel 20231022 ('Al-Aqsa Deluge') released [stable] -GNU Parallel 20230922 ('Derna') has been released. It is available for download at: lbry://@GnuParallel:4 +GNU Parallel 20231022 ('Al-Aqsa Deluge') has been released. It is available for download at: lbry://@GnuParallel:4 Quote of the month: - Parallel is so damn good! You’ve got to use it. - -- @ThePrimeTimeagen@youtube.com - + Love to make a dual processor workstation absolutely whir running dozens of analysis scripts at once + -- Best Catboy Key Grip @alamogordoglass@twitter + 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 +* Resume long parallel jobs https://ginolhac.github.io/posts/2023-10-02_resume-parallel/index.html -* 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 +* Efficiency and Speed with GNU Parallel https://dev.to/0xog_pg/efficiency-and-speed-with-gnu-parallel-loo GNU Parallel - For people who live life in the parallel lane. diff --git a/packager/obs/Makefile b/packager/obs/Makefile dissimilarity index 74% index 1fcb7949..91f98239 100644 --- a/packager/obs/Makefile +++ b/packager/obs/Makefile @@ -1,32 +1,9 @@ -all: - perl -e 'exit $$ENV{YYYYMMDD} !~ /20/' - cd ../debian/ && make - 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 - cd home-tange/parallel && perl -i -pe 's/pkgver=.*/pkgver=$$ENV{YYYYMMDD}/' PKGBUILD - cd home-tange/parallel/ && osc diff - cd home-tange/parallel/ && osc up - cd home-tange/parallel/ && parallel osc add ::: *.spec *.dsc *.tar.gz *.tar.bz2 && echo Src added OK || true - cd home-tange/parallel/ && osc ci -m "New release" - ### Wait for "building" state to complete - echo '### Wait for "building" state' - sleep 3 - cd home-tange/parallel/ && yes building | parallel -vj1 --delay 10 --halt now,success=1 'osc results|G -E {}' - echo '### Wait for "building" state to end' - echo '### Ignore RedHat_RHEL-6 and Univention_3.2 that are broken' - cd home-tange/parallel/ && yes building | parallel -vj1 --delay 10 --halt now,fail=1 'osc results|G -v RedHat_RHEL-6 -v Univention_3.2 -E {}' || true - echo '### Wait for "finished" state of .deb' - cd home-tange/parallel/ && echo succeeded | parallel -vj1 --retries 30 --delay 10 --halt now,success=1 'osc results|G -E "(Debian|Ubuntu).*{}"' - echo '### Wait for "finished" state of .rpm' - cd home-tange/parallel/ && echo succeeded | parallel -vj1 --retries 30 --delay 10 --halt now,success=1 'osc results|G -E "(SUSE|SLE|Scientific|RHEL|Fedora|CentOS).*{}"' - echo 'Check:' - echo 'https://build.opensuse.org/package/show/home:tange/parallel' +all: + perl -e 'exit $$ENV{YYYYMMDD} !~ /20/' + cd ../debian/ && make + 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 diff --git a/packager/obs/home-tange/parallel/.osc/_files b/packager/obs/home-tange/parallel/.osc/_files dissimilarity index 98% index ffdb1bd5..8219392e 100644 --- a/packager/obs/home-tange/parallel/.osc/_files +++ b/packager/obs/home-tange/parallel/.osc/_files @@ -1,10 +1,8 @@ - - - - - - - - - - + + + + + + + + diff --git a/packager/obs/home-tange/parallel/.osc/parallel.spec b/packager/obs/home-tange/parallel/.osc/parallel.spec index 3f56d1a2..997ae567 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: 20230922 +Version: 20231022 Release: 2.1 License: GPL-3.0-or-later Group: Productivity/File utilities diff --git a/packager/obs/home-tange/parallel/Makefile b/packager/obs/home-tange/parallel/Makefile new file mode 100644 index 00000000..b97c38d4 --- /dev/null +++ b/packager/obs/home-tange/parallel/Makefile @@ -0,0 +1,22 @@ +all: + # Update sha256sum + s=`sha256sum parallel-*.tar.bz2|field 1` perl -i -pe 's/(sha256sums=..)\w+(..)/$$1$$ENV{s}$$2/' PKGBUILD + # Update version + perl -i -pe 's/pkgver=.*/pkgver=$$ENV{YYYYMMDD}/' PKGBUILD + osc diff + osc up + parallel osc add ::: *.spec *.dsc *.tar.gz *.tar.bz2 && echo Src added OK || true + osc ci -m "New release" + ### Wait for "building" state to complete + echo '### Wait for "building" state' + sleep 3 + yes building | parallel -vj1 --delay 10 --halt now,success=1 'osc results|G -E {}' + echo '### Wait for "building" state to end' + echo '### Ignore RedHat_RHEL-6 and Univention_3.2 that are broken' + yes building | parallel -vj1 --delay 10 --halt now,fail=1 'osc results|G -v RedHat_RHEL-6 -v Univention_3.2 -E {}' || true + echo '### Wait for "finished" state of .deb' + echo succeeded | parallel -vj1 --retries 30 --delay 10 --halt now,success=1 'osc results|G -E "(Debian|Ubuntu).*{}"' + echo '### Wait for "finished" state of .rpm' + echo succeeded | parallel -vj1 --retries 30 --delay 10 --halt now,success=1 'osc results|G -E "(SUSE|SLE|Scientific|RHEL|Fedora|CentOS).*{}"' + echo 'Check:' + echo 'https://build.opensuse.org/package/show/home:tange/parallel' diff --git a/src/env_parallel.ash b/src/env_parallel.ash index 3ade4eef..61d5718d 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 20230922 (GNU parallel `parallel --minversion 1`)" + echo "parset 20231022 (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 ee92064d..28f10d61 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 20230922 (GNU parallel `parallel --minversion 1`)" + echo "parset 20231022 (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 fc580a7f..b51de2df 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 20230922 (GNU parallel `parallel --minversion 1`)" + echo "parset 20231022 (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 7739e7e9..f1707131 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 20230922 (GNU parallel `parallel --minversion 1`)" + echo "parset 20231022 (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 1e016b98..44eca495 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 20230922 (GNU parallel `parallel --minversion 1`)" + echo "parset 20231022 (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 55d52129..5ce32528 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 20230922 (GNU parallel `parallel --minversion 1`)" + echo "parset 20231022 (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 92ff5a93..509b7cbb 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 20230922 (GNU parallel `parallel --minversion 1`)" + echo "parset 20231022 (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 3085b878..7662444e 100755 --- a/src/niceload +++ b/src/niceload @@ -26,7 +26,7 @@ use strict; use Getopt::Long; $Global::progname="niceload"; -$Global::version = 20230922; +$Global::version = 20231022; 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 b2dba641..7e9f5129 100755 --- a/src/parallel +++ b/src/parallel @@ -2800,7 +2800,7 @@ sub check_invalid_option_combinations() { sub init_globals() { # Defaults: - $Global::version = 20230922; + $Global::version = 20231022; $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, September 22). GNU Parallel 20230922 ('Derna').", - " Zenodo. https://doi.org/10.5281/zenodo.8374296", + " Tange, O. (2023, October 22). GNU Parallel 20231022 ('Al-Aqsa Deluge').", + " Zenodo. https://doi.org/10.5281/zenodo.10035562", "", # 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, September 22). GNU Parallel 20230922 ('Derna').", - " Zenodo. https://doi.org/10.5281/zenodo.8374296", + " Tange, O. (2023, October 22). GNU Parallel 20231022 ('Al-Aqsa Deluge').", + " Zenodo. https://doi.org/10.5281/zenodo.10035562", "", # 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_8374296,", + "\@software{tange_2023_10035562,", " author = {Tange, Ole},", - " title = {GNU Parallel 20230922 ('Derna')},", - " month = Sep,", + " title = {GNU Parallel 20231022 ('Al-Aqsa Deluge')},", + " month = Oct,", " 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.8374296},", - " url = {https://doi.org/10.5281/zenodo.8374296}", + " doi = {10.5281/zenodo.10035562},", + " url = {https://doi.org/10.5281/zenodo.10035562}", "}", "", - "(Feel free to use \\nocite{tange_2023_8374296})", + "(Feel free to use \\nocite{tange_2023_10035562})", "", # 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 70677dfa..414a321f 100644 --- a/src/parallel.pod +++ b/src/parallel.pod @@ -1466,6 +1466,8 @@ Evaluate I. E.g. '12/2' to get 6, '+25%' gives the same as multiply 3 by log(55), multiply that by the number of CPU threads and divide by 100, add this to the number of CPU threads. +An expression that evalutates to less that 1 is replaced with 1. + =item I Read parameter from file. diff --git a/src/parallel_alternatives.pod b/src/parallel_alternatives.pod index f77f43b6..bb7f2b7c 100644 --- a/src/parallel_alternatives.pod +++ b/src/parallel_alternatives.pod @@ -814,7 +814,7 @@ Summary (see legend above): =item M1 (M2) M3 (M4) M5 M6 -=item - O2 O3 - O5 - - N/A N/A O10 +=item - O2 O3 - O5 - - x x O10 =item E1 - - - - - - @@ -2697,7 +2697,7 @@ Summary (see legend above): =item M1 - M3 - - M6 -=item O1 - O3 - O5 - - N/A N/A +=item O1 - O3 - O5 - - x x =item E1 - - E4 - - - @@ -2730,7 +2730,7 @@ Summary (see legend above): =item M1 - (M3) - - M6 -=item O1 O2 O3 - O5 O6 - N/A N/A - +=item O1 O2 O3 - O5 O6 - x x - =item E1 - - - - - - @@ -2869,7 +2869,7 @@ Summary (see legend above): =item M1 - M3 - - M6 -=item - - O3 - O5 - - N/A N/A O10 +=item - - O3 - O5 - - x x O10 =item E1 - - E4 - - - @@ -2926,7 +2926,7 @@ Summary (see legend above): =item - - - - - M6 -=item - O2 O3 - O5 O6 - N/A N/A O10 +=item - O2 O3 - O5 O6 - x x O10 =item E1 - - E4 - E6 - @@ -3448,7 +3448,7 @@ Summary (see legend above): =over -=item - - - I4 - - N/A +=item - - - I4 - - x =item - - - - - M6 @@ -3662,11 +3662,11 @@ Summary (see legend above): =over -=item - - - I4 - - N/A +=item - - - I4 - - x =item M1 - - - - M6 -=item - - O3 - - - - N/A - - +=item - - O3 - - - - x - - =item E1 - E3 - E5 - - @@ -3781,7 +3781,7 @@ Summary (see legend above): =item - - - - - M6 -=item O1 O2 O3 - O5 O6 - N/A - O10 +=item O1 O2 O3 - O5 O6 - x - O10 =item E1 - - E4 - - - @@ -3850,7 +3850,7 @@ Summary (see legend above): =item M1 - - - - M6 -=item O1 - O3 - - - - N/A - - +=item O1 - O3 - - - - x - - =item E1 - - E4 - - - @@ -4094,11 +4094,11 @@ Summary (see legend above): =item M1 - - - - M6 -=item - - O3 - - - - N/A N/A - +=item - - O3 - - - - x x - =item E1 - - - - - - -=item R1 - - - - R6 N/A N/A - +=item R1 - - - - R6 x x - =item - - @@ -4143,8 +4143,145 @@ https://github.com/korovkin/parallel (Last checked: 2023-07) +=head2 DIFFERENCES BETWEEN xe AND GNU Parallel + +Summary (see legend above): + +=over + +=item I1 I2 - I4 - - I7 + +=item M1 - M3 M4 - M6 + +=item - O2 O3 - O5 O6 - O8 - O10 + +=item E1 - - E4 - - - + +=item - - - - - - - - - + +=item - - + +=back + +B has a peculiar limitation: + + echo /bin/echo | xe {} OK + echo echo | xe /bin/{} fails + + +=head3 EXAMPLES + +Compress all .c files in the current directory, using all CPU cores: + + 1$ xe -a -j0 gzip -- *.c + + 1$ parallel gzip ::: *.c + +Remove all empty files, using lr(1): + + 2$ lr -U -t 'size == 0' | xe -N0 rm + + 2$ lr -U -t 'size == 0' | parallel -X rm + +Convert .mp3 to .ogg, using all CPU cores: + + 3$ xe -a -j0 -s 'ffmpeg -i "${1}" "${1%.mp3}.ogg"' -- *.mp3 + + 3$ parallel ffmpeg -i {} {.}.ogg ::: *.mp3 + +Same, using percent rules: + + 4$ xe -a -j0 -p %.mp3 ffmpeg -i %.mp3 %.ogg -- *.mp3 + + 4$ parallel --rpl '% s/\.mp3// or skip' ffmpeg -i %.mp3 %.ogg ::: *.mp3 + +Similar, but hiding output of ffmpeg, instead showing spawned jobs: + + 5$ xe -ap -j0 -vvq '%.{m4a,ogg,opus}' ffmpeg -y -i {} out/%.mp3 -- * + + 5$ parallel -v --rpl '% s/\.(m4a|ogg|opus)// or skip' \ + ffmpeg -y -i {} out/%.mp3 '2>/dev/null' ::: * + + 5$ parallel -v ffmpeg -y -i {} out/{.}.mp3 '2>/dev/null' ::: * + +https://github.com/leahneukirchen/xe +(Last checked: 2023-08) + + +=head2 DIFFERENCES BETWEEN sp AND GNU Parallel + +Summary (see legend above): + +=over + +=item - - - I4 - - - + +=item M1 - M3 - - M6 + +=item - O2 O3 - O5 (O6) - x x O10 + +=item E1 - - - - - - + +=item - - - - - - - - - + +=item - - + +=back + +B has very few options. + +It can either be used like: + + sp command {} option :: arg1 arg2 arg3 + +which is similar to: + + parallel command {} option ::: arg1 arg2 arg3 + +Or: + + sp command1 :: "command2 -option" :: "command3 foo bar" + +which is similar to: + + parallel ::: command1 "command2 -option" "command3 foo bar" + +B deals badly with too many commands: This causes B to run out +of file handles and gives data loss. + +For each command that fails, B will print an error message on +stderr (standard error). + +You cannot used exported shell functions as commands. + +=head3 EXAMPLES + + 1$ sp echo {} :: 1 2 3 + + 1$ parallel echo {} ::: 1 2 3 + + 2$ sp echo {} {} :: 1 2 3 + + 2$ parallel echo {} {} :: 1 2 3 + + 3$ sp echo 1 :: echo 2 :: echo 3 + + 3$ parallel ::: 'echo 1' 'echo 2' 'echo 3' + + 4$ sp a foo bar :: "b 'baz bar'" :: c + + 4$ parallel ::: 'a foo bar' "b 'baz bar'" :: c + +https://github.com/SergioBenitez/sp +(Last checked: 2023-10) + + =head2 Todo +https://github.com/justanhduc/task-spooler + +https://manpages.ubuntu.com/manpages/xenial/man1/tsp.1.html + https://www.npmjs.com/package/concurrently http://code.google.com/p/push/ (cannot compile) @@ -4167,8 +4304,6 @@ https://github.com/flesler/parallel https://github.com/Julian/Verge -https://manpages.ubuntu.com/manpages/xenial/man1/tsp.1.html - https://vicerveza.homeunix.net/~viric/soft/ts/ https://github.com/chapmanjacobd/que diff --git a/src/parallel_tutorial.pod b/src/parallel_tutorial.pod index a6076b50..239e1fc1 100644 --- a/src/parallel_tutorial.pod +++ b/src/parallel_tutorial.pod @@ -20,8 +20,7 @@ or download it at: https://doi.org/10.5281/zenodo.1146014 Otherwise start by watching the intro videos for a quick introduction: https://www.youtube.com/playlist?list=PL284C9FF2488BC6D1 -Then browse through the Bs after the list of B in -B (Use B). That will give +Then browse through the examples (B). That will give you an idea of what GNU B is capable of. If you want to dive even deeper: spend a couple of hours walking @@ -51,12 +50,12 @@ security reasons), the way described in README, or with this command: $ (wget -O - pi.dk/3 || lynx -source pi.dk/3 || curl pi.dk/3/ || \ fetch -o - http://pi.dk/3 ) > install.sh $ sha1sum install.sh - 12345678 3374ec53 bacb199b 245af2dd a86df6c9 + 12345678 51621b7f 1ee103c0 0783aae4 ef9889f8 $ md5sum install.sh - 029a9ac0 6e8b5bc6 052eac57 b2c3c9ca + 62eada78 703b5500 241b8e50 baf62758 $ sha512sum install.sh - 40f53af6 9e20dae5 713ba06c f517006d 9897747b ed8a4694 b1acba1b 1464beb4 - 60055629 3f2356f3 3e9c4e3c 76e3f3af a9db4b32 bd33322b 975696fc e6b23cfb + 160d3159 9480cf5c a101512f 150b7ac0 206a65dc 86f2bb6b bdf1a2bc 96bc6d06 + 7f8237c2 0964b67f bccf8a93 332528fa 11e5ab43 2a6226a6 ceb197ab 7f03c061 $ bash install.sh This will also install the newest version of the tutorial which you @@ -145,7 +144,7 @@ So you must be able to do this without entering a password: ssh $SERVER1 echo works ssh $SERVER2 echo works -It can be setup by running 'ssh-keygen -t dsa; ssh-copy-id $SERVER1' +It can be setup by running B and using an empty passphrase, or you can use B. =back diff --git a/src/parsort b/src/parsort index 693c9831..21334794 100755 --- a/src/parsort +++ b/src/parsort @@ -137,7 +137,7 @@ GetOptions( "help" => \$opt::dummy, ) || exit(255); $Global::progname = ($0 =~ m:(^|/)([^/]+)$:)[1]; -$Global::version = 20230922; +$Global::version = 20231022; 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 6c10ac4d..6d61d3d2 100755 --- a/src/sql +++ b/src/sql @@ -670,7 +670,7 @@ $Global::Initfile && unlink $Global::Initfile; exit ($err); sub parse_options { - $Global::version = 20230922; + $Global::version = 20231022; $Global::progname = 'sql'; # This must be done first as this may exec myself diff --git a/testsuite/tests-to-run/parallel-freebsd.sh b/testsuite/tests-to-run/parallel-freebsd.sh index 73003389..ff1e91d3 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 --timeout 100 --env _ -vj9 -k --joblog /tmp/jl-`basename $0` --retries 3 \ +PARALLEL_SHELL=sh env_parallel --timeout 100 --env _ -vj4 -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/parallel-local-10s.sh b/testsuite/tests-to-run/parallel-local-10s.sh index b6624e5a..455dd2bb 100644 --- a/testsuite/tests-to-run/parallel-local-10s.sh +++ b/testsuite/tests-to-run/parallel-local-10s.sh @@ -36,25 +36,6 @@ par_seqreplace_long_line() { uniq -c } -par__print_in_blocks() { - echo '### bug #41565: Print happens in blocks - not after each job complete' - median() { perl -e '@a=sort {$a<=>$b} <>;print $a[$#a/2]';} - export -f median - - echo 'The timing here is important: a full second between each' - perl -e 'for(1..30){print("$_\n");`sleep 1`}' | - parallel -j3 'echo {#}' | - timestamp -dd | - perl -pe '$_=int($_+0.3)."\n"' | - median - echo '300 ms jobs:' - perl -e 'for(1..30){print("$_\n");`sleep .3`}' | - parallel -j3 --delay 0.3 echo | - timestamp -d -d | - perl -pe 's/(.....).*/int($1*10+0.2)/e' | - median -} - par__load_from_PARALLEL() { echo "### Test reading load from PARALLEL" export PARALLEL="--load 300%" @@ -102,7 +83,7 @@ par_quote_special_results() { "mkfs.reiserfs -fq" "mkfs.ntfs -F" "mkfs.xfs -f" mkfs.minix \ mkfs.fat mkfs.vfat mkfs.msdos mkfs.f2fs | perl -pe 's:(/dev/loop|par-test-loop)\S+:$1:g;s/ +/ /g' | - G -v MB/s -v GB/s -v UUID -v Binutils -v 150000 + G -v MB/s -v GB/s -v UUID -v Binutils -v 150000 -v exfatprogs # Skip: # mkfs.bfs - ro # mkfs.cramfs - ro diff --git a/testsuite/tests-to-run/parallel-local-30s.sh b/testsuite/tests-to-run/parallel-local-30s.sh index b6ecfa63..6fd24169 100755 --- a/testsuite/tests-to-run/parallel-local-30s.sh +++ b/testsuite/tests-to-run/parallel-local-30s.sh @@ -8,6 +8,25 @@ # Each should be taking 30-100s and be possible to run in parallel # I.e.: No race conditions, no logins +par__print_in_blocks() { + echo '### bug #41565: Print happens in blocks - not after each job complete' + median() { perl -e '@a=sort {$a<=>$b} <>;print $a[$#a/2]';} + export -f median + + echo 'The timing here is important: a full second between each' + perl -e 'for(1..30){print("$_\n");`sleep 1`}' | + parallel -j3 'echo {#}' | + timestamp -dd | + perl -pe '$_=int($_+0.3)."\n"' | + median + echo '300 ms jobs:' + perl -e 'for(1..30){print("$_\n");`sleep .3`}' | + parallel -j3 --delay 0.3 echo | + timestamp -d -d | + perl -pe 's/(.....).*/int($1*10+0.2)/e' | + median +} + par__keeporder_roundrobin() { echo 'bug #50081: --keep-order --round-robin should give predictable results' . `which env_parallel.bash` diff --git a/testsuite/tests-to-run/parallel-local-ssh7.sh b/testsuite/tests-to-run/parallel-local-ssh7.sh index c1add0ee..d7707879 100755 --- a/testsuite/tests-to-run/parallel-local-ssh7.sh +++ b/testsuite/tests-to-run/parallel-local-ssh7.sh @@ -1720,7 +1720,7 @@ _EOF par_environment_too_big_bash() { myscript=$(cat <<'_EOF' echo 'bug #50815: env_parallel should warn if the environment is too big' - len_overhead=-$( (shopt;alias;typeset -f;typeset -p) | wc -c)/1000 + len_overhead=-10-$( (shopt;alias;typeset -f;typeset -p) | wc -c)/1000 len_var=$len_overhead+56 len_var_remote=$len_overhead+40 len_var_quote=$len_overhead+31 diff --git a/testsuite/tests-to-run/sql01.sh b/testsuite/tests-to-run/sql01.sh index 02cc6753..2b30f1de 100755 --- a/testsuite/tests-to-run/sql01.sh +++ b/testsuite/tests-to-run/sql01.sh @@ -132,11 +132,22 @@ par_--html() { echo } -par_listproc() { +par__listproc() { echo "### Test --show-processlist|proclist|listproc"; - sql --show-processlist "$DBURL" | wc -lw - sql --proclist "$DBURL" | wc -lw - sql --listproc "$DBURL" | wc -lw + # Take the minimum of 3 runs to avoid error counting + # if one of the other jobs happens to be running + ( + sql --show-processlist "$DBURL" | wc -lw + sql --show-processlist "$DBURL" | wc -lw + ) | sort | head -n1 + ( + sql --proclist "$DBURL" | wc -lw + sql --proclist "$DBURL" | wc -lw + ) | sort | head -n1 + ( + sql --listproc "$DBURL" | wc -lw + sql --listproc "$DBURL" | wc -lw + ) | sort | head -n1 } par_dbsize() { diff --git a/testsuite/vagrant/FritsHoogland/centos3/Vagrantfile b/testsuite/vagrant/FritsHoogland/centos3/Vagrantfile index b7fe8097..223f7c36 100644 --- a/testsuite/vagrant/FritsHoogland/centos3/Vagrantfile +++ b/testsuite/vagrant/FritsHoogland/centos3/Vagrantfile @@ -1,6 +1,10 @@ # -*- mode: ruby -*- # vi: set ft=ruby : +# SPDX-FileCopyrightText: 2023 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# +# SPDX-License-Identifier: GPL-3.0-or-later + # All Vagrant configuration is done below. The "2" in Vagrant.configure # configures the configuration version (we support older styles for # backwards compatibility). Please don't change it unless you know what diff --git a/testsuite/vagrant/FritsHoogland/centos39-oracle817/Vagrantfile b/testsuite/vagrant/FritsHoogland/centos39-oracle817/Vagrantfile index b7fe8097..223f7c36 100644 --- a/testsuite/vagrant/FritsHoogland/centos39-oracle817/Vagrantfile +++ b/testsuite/vagrant/FritsHoogland/centos39-oracle817/Vagrantfile @@ -1,6 +1,10 @@ # -*- mode: ruby -*- # vi: set ft=ruby : +# SPDX-FileCopyrightText: 2023 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# +# SPDX-License-Identifier: GPL-3.0-or-later + # All Vagrant configuration is done below. The "2" in Vagrant.configure # configures the configuration version (we support older styles for # backwards compatibility). Please don't change it unless you know what diff --git a/testsuite/vagrant/generic/freebsd13/Vagrantfile b/testsuite/vagrant/generic/freebsd13/Vagrantfile index 16966670..7947ffce 100644 --- a/testsuite/vagrant/generic/freebsd13/Vagrantfile +++ b/testsuite/vagrant/generic/freebsd13/Vagrantfile @@ -1,6 +1,10 @@ # -*- mode: ruby -*- # vi: set ft=ruby : +# SPDX-FileCopyrightText: 2023 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# +# SPDX-License-Identifier: GPL-3.0-or-later + # All Vagrant configuration is done below. The "2" in Vagrant.configure # configures the configuration version (we support older styles for # backwards compatibility). Please don't change it unless you know what diff --git a/testsuite/wanted-results/parallel-local-10s b/testsuite/wanted-results/parallel-local-10s index f166c4cc..6e9f8ba4 100644 --- a/testsuite/wanted-results/parallel-local-10s +++ b/testsuite/wanted-results/parallel-local-10s @@ -21,11 +21,6 @@ par__load_from_PARALLEL 8a7095c1c23bfadc311fe6b16d950582 - par__load_from_PARALLEL 8a7095c1c23bfadc311fe6b16d950582 - par__pipepart_spawn ### bug #46214: Using --pipepart doesnt spawn multiple jobs in version 20150922 par__pipepart_spawn 1:local / 2+ / 2+ -par__print_in_blocks ### bug #41565: Print happens in blocks - not after each job complete -par__print_in_blocks The timing here is important: a full second between each -par__print_in_blocks 1 -par__print_in_blocks 300 ms jobs: -par__print_in_blocks 3 par__round_robin_blocks bug #49664: --round-robin does not complete par__round_robin_blocks 8 par_colsep ### Test of --colsep @@ -748,7 +743,6 @@ par_quote_special_results mkfs.btrfs . ./ ./ ./ ./ ./ ./ ./ ./ ./ ./ ./ par_quote_special_results mkfs.btrfs . ./€ ./� ./‚ ./ƒ ./„ ./… ./† ./‡ ./ˆ ./‰ ./Š ./‹ ./Œ ./� ./Ž ./� ./� ./‘ ./’ ./“ ./” ./• ./– ./— ./˜ ./™ ./š ./› ./œ ./� ./ž ./Ÿ ./  ./¡ ./¢ ./£ ./¤ ./¥ ./¦ ./§ ./¨ ./© ./ª ./« ./¬ ./­ ./® ./¯ ./° ./± ./² ./³ ./´ ./µ ./¶ ./· ./¸ ./¹ ./º ./» ./¼ ./½ ./¾ ./¿ ./À ./Á ./ ./à ./Ä ./Å ./Æ ./Ç ./È ./É ./Ê ./Ë ./Ì ./Í ./Î ./Ï ./Ð ./Ñ ./Ò ./Ó ./Ô ./Õ ./Ö ./× ./Ø ./Ù ./Ú ./Û ./Ü ./Ý ./Þ ./ß ./à ./á ./â ./ã ./ä ./å ./æ ./ç ./è ./é ./ê ./ë ./ì ./í ./î ./ï ./ð ./ñ ./ò ./ó ./ô ./õ ./ö ./÷ ./ø ./ù ./ú ./û ./ü ./ý ./þ ./ÿ par_quote_special_results mkfs.btrfs 150+0 records in par_quote_special_results mkfs.btrfs 150+0 records out -par_quote_special_results mkfs.exfat exfatprogs version : 1.1.3 par_quote_special_results mkfs.exfat Creating exFAT filesystem(/dev/shm/par-test-loop cluster size=4096) par_quote_special_results mkfs.exfat par_quote_special_results mkfs.exfat Writing volume boot record: done diff --git a/testsuite/wanted-results/parallel-local-30s b/testsuite/wanted-results/parallel-local-30s index f138ad7f..40e04242 100644 --- a/testsuite/wanted-results/parallel-local-30s +++ b/testsuite/wanted-results/parallel-local-30s @@ -1607,6 +1607,11 @@ par__plus_dyn_repl abcabcdefdef abcdefdef par__plus_dyn_repl abcabcdefdef abcdefdef par__plus_dyn_repl abcabcdefdef abcabcdef par__plus_dyn_repl abcabcdefdef abcabcdef +par__print_in_blocks ### bug #41565: Print happens in blocks - not after each job complete +par__print_in_blocks The timing here is important: a full second between each +par__print_in_blocks 1 +par__print_in_blocks 300 ms jobs: +par__print_in_blocks 3 par_bin ### Test --bin par_bin 2 2 4 par_bin 2 2 4 diff --git a/testsuite/wanted-results/parallel-tutorial b/testsuite/wanted-results/parallel-tutorial index 859d9cdd..ba547b34 100644 --- a/testsuite/wanted-results/parallel-tutorial +++ b/testsuite/wanted-results/parallel-tutorial @@ -1,12 +1,12 @@ ### test parallel_tutorial fetch -o - http://pi.dk/3 ) > install.sh $ sha1sum install.sh - 12345678 3374ec53 bacb199b 245af2dd a86df6c9 + 12345678 51621b7f 1ee103c0 0783aae4 ef9889f8 $ md5sum install.sh - 029a9ac0 6e8b5bc6 052eac57 b2c3c9ca + 62eada78 703b5500 241b8e50 baf62758 $ sha512sum install.sh - 40f53af6 9e20dae5 713ba06c f517006d 9897747b ed8a4694 b1acba1b 1464beb4 - 60055629 3f2356f3 3e9c4e3c 76e3f3af a9db4b32 bd33322b 975696fc e6b23cfb + 160d3159 9480cf5c a101512f 150b7ac0 206a65dc 86f2bb6b bdf1a2bc 96bc6d06 + 7f8237c2 0964b67f bccf8a93 332528fa 11e5ab43 2a6226a6 ceb197ab 7f03c061 $ bash install.sh /usr/bin/bash: -c: line 1: syntax error near unexpected token `)' /usr/bin/bash: -c: line 1: ` fetch -o - http://pi.dk/3 ) > install.sh' diff --git a/testsuite/wanted-results/sql01 b/testsuite/wanted-results/sql01 index 9ea4e264..eb4cf26b 100644 --- a/testsuite/wanted-results/sql01 +++ b/testsuite/wanted-results/sql01 @@ -53,16 +53,16 @@ par_-r Is the server running on that host and accepting TCP/IP connections? par_-r [ | psql -h 127.0.0.3 -U nongood -p 2227 -d nongood] par_-r psql: error: connection to server at "127.0.0.3", port 2227 failed: Connection refused par_-r Is the server running on that host and accepting TCP/IP connections? +par__listproc ### Test --show-processlist|proclist|listproc +par__listproc 2 17 +par__listproc 2 17 +par__listproc 2 17 par_dbsize ### Test --db-size --dbsize par_dbsize 6 par_dbsize 6 par_dburl_user_password_host_port ### Test dburl with username password host port par_dburl_user_password_host_port Test dburl with username password host port par_dburl_user_password_host_port OK -par_listproc ### Test --show-processlist|proclist|listproc -par_listproc 3 32 -par_listproc 2 17 -par_listproc 2 17 par_noheaders ### Test --noheaders --no-headers -n par_noheaders abc 1 par_noheaders def 3 -- 2.11.4.GIT