From 0608b23da31b2cfea531c999ba9256c09dd239b9 Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Thu, 16 May 2013 22:49:17 +0200 Subject: [PATCH] Passes testsuite. --- README | 12 +- configure | 20 +- configure.ac | 2 +- doc/release_new_version | 37 ++- src/niceload | 2 +- src/parallel | 17 +- src/sql | 2 +- testsuite/wanted-results/parallel-polarhome | 329 +++++++++++--------- testsuite/wanted-results/test15 | 2 +- testsuite/wanted-results/test19 | 4 +- testsuite/wanted-results/test21 | 16 +- testsuite/wanted-results/test37 | 2 +- testsuite/wanted-results/test61 | 8 +- 13 files changed, 257 insertions(+), 196 deletions(-) diff --git a/README b/README index 0b2b6091..abde4e84 100644 --- a/README +++ b/README @@ -40,9 +40,9 @@ document. Full installation of GNU Parallel is as simple as: - wget http://ftpmirror.gnu.org/parallel/parallel-20130422.tar.bz2 - bzip2 -dc parallel-20130422.tar.bz2 | tar xvf - - cd parallel-20130422 + wget http://ftpmirror.gnu.org/parallel/parallel-20130514.tar.bz2 + bzip2 -dc parallel-20130514.tar.bz2 | tar xvf - + cd parallel-20130514 ./configure && make && make install @@ -51,9 +51,9 @@ 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 http://ftpmirror.gnu.org/parallel/parallel-20130422.tar.bz2 - bzip2 -dc parallel-20130422.tar.bz2 | tar xvf - - cd parallel-20130422 + wget http://ftpmirror.gnu.org/parallel/parallel-20130514.tar.bz2 + bzip2 -dc parallel-20130514.tar.bz2 | tar xvf - + cd parallel-20130514 ./configure --prefix=$HOME && make && make install Or if your system lacks 'make' you can simply copy src/parallel diff --git a/configure b/configure index 09c35386..333c4d8f 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.68 for parallel 20130422. +# Generated by GNU Autoconf 2.68 for parallel 20130514. # # Report bugs to . # @@ -559,8 +559,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='parallel' PACKAGE_TARNAME='parallel' -PACKAGE_VERSION='20130422' -PACKAGE_STRING='parallel 20130422' +PACKAGE_VERSION='20130514' +PACKAGE_STRING='parallel 20130514' PACKAGE_BUGREPORT='bug-parallel@gnu.org' PACKAGE_URL='' @@ -1176,7 +1176,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 20130422 to adapt to many kinds of systems. +\`configure' configures parallel 20130514 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1242,7 +1242,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of parallel 20130422:";; + short | recursive ) echo "Configuration of parallel 20130514:";; esac cat <<\_ACEOF @@ -1309,7 +1309,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -parallel configure 20130422 +parallel configure 20130514 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1326,7 +1326,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 20130422, which was +It was created by parallel $as_me 20130514, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2141,7 +2141,7 @@ fi # Define the identity of the package. PACKAGE='parallel' - VERSION='20130422' + VERSION='20130514' cat >>confdefs.h <<_ACEOF @@ -2704,7 +2704,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 20130422, which was +This file was extended by parallel $as_me 20130514, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2766,7 +2766,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -parallel config.status 20130422 +parallel config.status 20130514 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5ae3c00d..b9aa88a4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([parallel], [20130422], [bug-parallel@gnu.org]) +AC_INIT([parallel], [20130514], [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 886e0004..6635ebea 100644 --- a/doc/release_new_version +++ b/doc/release_new_version @@ -65,15 +65,28 @@ cp doc/parallel.latest.directive parallel-latest.tar.bz2.directive perl -i -pe "s/20\d\d\d\d\d\d/latest/" parallel-latest.tar.*directive gpg --clearsign --yes parallel-latest.tar.bz2.directive -YYYYMMDD=`yyyymmdd` -gpg -b parallel-$YYYYMMDD.tar.bz2 -gpg -b --yes parallel-latest.tar.bz2 +(echo "To check the signature run:"; + echo " echo | gpg"; + echo " gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-$YYYYMMDD.tar.bz2.sig"; + echo + gpg -ab -o - parallel-$YYYYMMDD.tar.bz2 +) > parallel-$YYYYMMDD.tar.bz2.sig + +(echo "To check the signature run:"; + echo " echo | gpg"; + echo " gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-latest.tar.bz2.sig"; + echo + gpg -ab -o - parallel-latest.tar.bz2 +) > parallel-latest.tar.bz2.sig + +gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-latest.tar.bz2.sig +gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-$YYYYMMDD.tar.bz2.sig -YYYYMMDD=`yyyymmdd` echo put parallel-$YYYYMMDD.tar.bz2{,.sig,*asc} | ncftp ftp://ftp-upload.gnu.org/incoming/ftp/ echo put parallel-latest.tar.bz2{,.sig,*asc} | ncftp ftp://ftp-upload.gnu.org/incoming/ftp/ #echo put parallel-$YYYYMMDD.tar.bz2{,.sig,*asc} | ncftp ftp://ftp-upload.gnu.org/incoming/alpha/ + == Update OpenSUSE build system == cd ~/privat/parallel/packager/obs @@ -170,13 +183,25 @@ cc:Sandro Cazzaniga , Ryoichiro Suzuki , Jesse Alama -Subject: GNU Parallel 20130522 ('') released +Subject: GNU Parallel 20130522 ('Rana Plaza') released -GNU Parallel 20130522 ('') has been released. It is +GNU Parallel 20130522 ('Rana Plaza') has been released. It is available for download at: http://ftp.gnu.org/gnu/parallel/ +The changes for this release has been in the core of the code, so this +release should be considered beta quality. + New in this release: +* --ctrlc is now default if --pipe is not used; thus making it + possible to kill remotely started jobs simply by pressing Ctrl-C. + +* --timeout 200% now means kill jobs that take more than twice the + time of the median run time of a job. + +* Jobs are now distributed round robin when having mulitiple + --sshlogin instead of filling up one --sshlogin at a time. + * Bug fixes and man page updates. diff --git a/src/niceload b/src/niceload index d34aa697..27400753 100755 --- a/src/niceload +++ b/src/niceload @@ -24,7 +24,7 @@ use strict; use Getopt::Long; $Global::progname="niceload"; -$Global::version = 20130422; +$Global::version = 20130514; 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 01e154f4..692e100d 100755 --- a/src/parallel +++ b/src/parallel @@ -645,7 +645,7 @@ sub get_options_from_array { sub parse_options { # Returns: N/A # Defaults: - $Global::version = 20130511; + $Global::version = 20130514; $Global::progname = 'parallel'; $Global::infinity = 2**31; $Global::debug = 0; @@ -760,7 +760,7 @@ sub parse_options { } if($opt::tollef and not $opt::gnu and not $opt::plain) { # Behave like tollef parallel (from moreutils) - if($Global::version > 20140222) { + if($Global::version > 20130514) { ::error("--tollef has been retired. See http://lists.gnu.org/archive/html/parallel/2013-02/msg00018.html\n"); ::wait_and_exit(255); } @@ -3795,16 +3795,13 @@ sub sshlogin_wrap { if(not $opt::pipe or $opt::ctrlc) { # Propagating CTRL-C to kill remote jobs requires # remote jobs to be run with a terminal. - # That means input cannot be 8-bit clean, but - # must be Base64-encoded. - # TODO this currently does not work, so --ctrlc cannot - # read from stdin (e.g. with --pipe) $ssh_options = "-tt -oLogLevel=quiet"; + # tty - check if we have a tty. # stty: - # -onlcr - make output 8-bit clean - # isig - pass CTRL-C as signal - # -echo - do not echo input - $remote_pre .= ::shell_quote_scalar('stty isig -onlcr -echo;'); + # -onlcr - make output 8-bit clean + # isig - pass CTRL-C as signal + # -echo - do not echo input + $remote_pre .= ::shell_quote_scalar('tty >/dev/null && stty isig -onlcr -echo;'); } if($opt::workdir) { $remote_pre .= diff --git a/src/sql b/src/sql index bce090d4..c70db64c 100755 --- a/src/sql +++ b/src/sql @@ -556,7 +556,7 @@ $Global::Initfile && unlink $Global::Initfile; exit ($err); sub parse_options { - $Global::version = 20130422; + $Global::version = 20130514; $Global::progname = 'sql'; # This must be done first as this may exec myself diff --git a/testsuite/wanted-results/parallel-polarhome b/testsuite/wanted-results/parallel-polarhome index 5528175b..ecf53744 100644 --- a/testsuite/wanted-results/parallel-polarhome +++ b/testsuite/wanted-results/parallel-polarhome @@ -6,150 +6,182 @@ Welcome to RedHat/Fedora ...member of polarhome.com realm Fedora release 17 (Beefy Miracle) Welcome to RedHat/Fedora ...member of polarhome.com realm -SCO OpenServer(TM) Release 6 -Welcome to scosysv ...member of polarhome.com realm - -SCO OpenServer(TM) Release 6 -Welcome to scosysv ...member of polarhome.com realm - - -CentOS release 5.6 (Final) -Welcome to CentOS ...member of polarhome.com realm - - -CentOS release 5.6 (Final) -Welcome to CentOS ...member of polarhome.com realm - - -DragonFly v2.10.1.1 -Welcome to DragonFly ...member of polarhome.com realm - - -DragonFly v2.10.1.1 -Welcome to DragonFly ...member of polarhome.com realm - - -NetBSD 5.1 -Welcome to NetBSD ...member of polarhome.com realm - - -NetBSD 5.1 -Welcome to NetBSD ...member of polarhome.com realm - - -FreeBSD 8.2 -Welcome to FreeBSD ...member of polarhome.com realm - - -FreeBSD 8.2 -Welcome to FreeBSD ...member of polarhome.com realm - - -SunOS 5.10 -SUN Ultra-5 -Welcome to Solaris ...member of polarhome.com realm - - -SunOS 5.10 -SUN Ultra-5 -Welcome to Solaris ...member of polarhome.com realm - - -OpenBSD 4.9 -Welcome to OpenBSD ...member of polarhome.com realm - - -OpenBSD 4.9 -Welcome to OpenBSD ...member of polarhome.com realm - - -Debian GNU/Linux 6.0.2 (squeeze) -Welcome to debian ...member of polarhome.com realm - - -Debian GNU/Linux 6.0.2 (squeeze) -Welcome to debian ...member of polarhome.com realm - - -Welcome to AIX7 ...member of polarhome.com realm - -Welcome to AIX7 ...member of polarhome.com realm - -HP-UX hpux.polarhome.com B.11.11 U 9000/785 (ta) -Welcome to HPUX... member of polarhome.com realm - - -HP-UX hpux.polarhome.com B.11.11 U 9000/785 (ta) -Welcome to HPUX... member of polarhome.com realm - - -QNX 6.5.0 -Welcome to QNX ...member of polarhome.com realm - - -QNX 6.5.0 -Welcome to QNX ...member of polarhome.com realm - - -IRIX64 6.5 07202013 IP35 -Welcome to irix ...member of polarhome.com realm - -IRIX64 6.5 07202013 IP35 -Welcome to irix ...member of polarhome.com realm - -openSUSE 11.4 "Celadon" -Welcome to SuSE/openSUSE ...member of polarhome.com realm - - -openSUSE 11.4 "Celadon" -Welcome to SuSE/openSUSE ...member of polarhome.com realm - - -OpenIndiana SunOS 5.11 -Welcome to OpenIndiana ...member of polarhome.com realm - - -OpenIndiana SunOS 5.11 -Welcome to OpenIndiana ...member of polarhome.com realm - - -Mandriva Linux release 2010.2 (Official) for x86_64 -Welcome to Mandrake/Mandriva ...member of polarhome.com realm - - -Mandriva Linux release 2010.2 (Official) for x86_64 -Welcome to Mandrake/Mandriva ...member of polarhome.com realm - -SCO UnixWare 7.1.4 -Welcome to unixware ...member of polarhome.com realm - -SCO UnixWare 7.1.4 -Welcome to unixware ...member of polarhome.com realm - -Debian GNU/Linux 6.0 -RaspberryPi/bcm2708 reference 2.0 -Welcome to raspberrypi ...member of polarhome.com realm - -Debian GNU/Linux 6.0 -RaspberryPi/bcm2708 reference 2.0 -Welcome to raspberrypi ...member of polarhome.com realm - - -Debian GNU/Hurd wheezy/sid -Welcome to hurd ...member of polarhome.com realm. - - -Debian GNU/Hurd wheezy/sid -Welcome to hurd ...member of polarhome.com realm. - - -Ubuntu 10.04.2 LTS -Welcome to Ubuntu ...member of polarhome.com realm - - -Ubuntu 10.04.2 LTS -Welcome to Ubuntu ...member of polarhome.com realm - +ssh scosysv.polarhome.com rm -f bin/parallel;scp bin/parallel scosysv.polarhome.com:bin/ +ssh centos.polarhome.com rm -f bin/parallel;scp bin/parallel centos.polarhome.com:bin/ +ssh dragonfly.polarhome.com rm -f bin/parallel;scp bin/parallel dragonfly.polarhome.com:bin/ +ssh netbsd.polarhome.com rm -f bin/parallel;scp bin/parallel netbsd.polarhome.com:bin/ +ssh freebsd.polarhome.com rm -f bin/parallel;scp bin/parallel freebsd.polarhome.com:bin/ +ssh solaris.polarhome.com rm -f bin/parallel;scp bin/parallel solaris.polarhome.com:bin/ +ssh openbsd.polarhome.com rm -f bin/parallel;scp bin/parallel openbsd.polarhome.com:bin/ +ssh debian.polarhome.com rm -f bin/parallel;scp bin/parallel debian.polarhome.com:bin/ +ssh aix.polarhome.com rm -f bin/parallel;scp bin/parallel aix.polarhome.com:bin/ +ssh hpux.polarhome.com rm -f bin/parallel;scp bin/parallel hpux.polarhome.com:bin/ +ssh qnx.polarhome.com rm -f bin/parallel;scp bin/parallel qnx.polarhome.com:bin/ +ssh irix.polarhome.com rm -f bin/parallel;scp bin/parallel irix.polarhome.com:bin/ +ssh suse.polarhome.com rm -f bin/parallel;scp bin/parallel suse.polarhome.com:bin/ +ssh minix.polarhome.com rm -f bin/parallel;scp bin/parallel minix.polarhome.com:bin/ +ssh openindiana.polarhome.com rm -f bin/parallel;scp bin/parallel openindiana.polarhome.com:bin/ +ssh mandriva.polarhome.com rm -f bin/parallel;scp bin/parallel mandriva.polarhome.com:bin/ +ssh unixware.polarhome.com rm -f bin/parallel;scp bin/parallel unixware.polarhome.com:bin/ +ssh miros.polarhome.com rm -f bin/parallel;scp bin/parallel miros.polarhome.com:bin/ +ssh raspberrypi.polarhome.com rm -f bin/parallel;scp bin/parallel raspberrypi.polarhome.com:bin/ +ssh hurd.polarhome.com rm -f bin/parallel;scp bin/parallel hurd.polarhome.com:bin/ +ssh ultrix.polarhome.com rm -f bin/parallel;scp bin/parallel ultrix.polarhome.com:bin/ +ssh ubuntu.polarhome.com rm -f bin/parallel;scp bin/parallel ubuntu.polarhome.com:bin/ +scosysv.polarhome.com SCO OpenServer(TM) Release 6 +scosysv.polarhome.com Welcome to scosysv ...member of polarhome.com realm +scosysv.polarhome.com +scosysv.polarhome.com SCO OpenServer(TM) Release 6 +scosysv.polarhome.com Welcome to scosysv ...member of polarhome.com realm +scosysv.polarhome.com +centos.polarhome.com +centos.polarhome.com CentOS release 5.6 (Final) +centos.polarhome.com Welcome to CentOS ...member of polarhome.com realm +centos.polarhome.com +centos.polarhome.com +centos.polarhome.com CentOS release 5.6 (Final) +centos.polarhome.com Welcome to CentOS ...member of polarhome.com realm +centos.polarhome.com +dragonfly.polarhome.com +dragonfly.polarhome.com DragonFly v2.10.1.1 +dragonfly.polarhome.com Welcome to DragonFly ...member of polarhome.com realm +dragonfly.polarhome.com +dragonfly.polarhome.com +dragonfly.polarhome.com DragonFly v2.10.1.1 +dragonfly.polarhome.com Welcome to DragonFly ...member of polarhome.com realm +dragonfly.polarhome.com +netbsd.polarhome.com +netbsd.polarhome.com NetBSD 5.1 +netbsd.polarhome.com Welcome to NetBSD ...member of polarhome.com realm +netbsd.polarhome.com +netbsd.polarhome.com MANPATH: Undefined variable. +netbsd.polarhome.com +netbsd.polarhome.com NetBSD 5.1 +netbsd.polarhome.com Welcome to NetBSD ...member of polarhome.com realm +netbsd.polarhome.com +netbsd.polarhome.com MANPATH: Undefined variable. +freebsd.polarhome.com +freebsd.polarhome.com FreeBSD 8.2 +freebsd.polarhome.com Welcome to FreeBSD ...member of polarhome.com realm +freebsd.polarhome.com +freebsd.polarhome.com +freebsd.polarhome.com FreeBSD 8.2 +freebsd.polarhome.com Welcome to FreeBSD ...member of polarhome.com realm +freebsd.polarhome.com +solaris.polarhome.com +solaris.polarhome.com SunOS 5.10 +solaris.polarhome.com SUN Ultra-5 +solaris.polarhome.com Welcome to Solaris ...member of polarhome.com realm +solaris.polarhome.com +solaris.polarhome.com +solaris.polarhome.com SunOS 5.10 +solaris.polarhome.com SUN Ultra-5 +solaris.polarhome.com Welcome to Solaris ...member of polarhome.com realm +solaris.polarhome.com +openbsd.polarhome.com +openbsd.polarhome.com OpenBSD 4.9 +openbsd.polarhome.com Welcome to OpenBSD ...member of polarhome.com realm +openbsd.polarhome.com +openbsd.polarhome.com +openbsd.polarhome.com OpenBSD 4.9 +openbsd.polarhome.com Welcome to OpenBSD ...member of polarhome.com realm +openbsd.polarhome.com +debian.polarhome.com +debian.polarhome.com Debian GNU/Linux 6.0.2 (squeeze) +debian.polarhome.com Welcome to debian ...member of polarhome.com realm +debian.polarhome.com +debian.polarhome.com +debian.polarhome.com Debian GNU/Linux 6.0.2 (squeeze) +debian.polarhome.com Welcome to debian ...member of polarhome.com realm +debian.polarhome.com +aix.polarhome.com +aix.polarhome.com Welcome to AIX7 ...member of polarhome.com realm +aix.polarhome.com +aix.polarhome.com Welcome to AIX7 ...member of polarhome.com realm +hpux.polarhome.com +hpux.polarhome.com HP-UX hpux.polarhome.com B.11.11 U 9000/785 (ta) +hpux.polarhome.com Welcome to HPUX... member of polarhome.com realm +hpux.polarhome.com +hpux.polarhome.com +hpux.polarhome.com HP-UX hpux.polarhome.com B.11.11 U 9000/785 (ta) +hpux.polarhome.com Welcome to HPUX... member of polarhome.com realm +hpux.polarhome.com +qnx.polarhome.com +qnx.polarhome.com QNX 6.5.0 +qnx.polarhome.com Welcome to QNX ...member of polarhome.com realm +qnx.polarhome.com +qnx.polarhome.com +qnx.polarhome.com QNX 6.5.0 +qnx.polarhome.com Welcome to QNX ...member of polarhome.com realm +qnx.polarhome.com +irix.polarhome.com +irix.polarhome.com IRIX64 6.5 07202013 IP35 +irix.polarhome.com Welcome to irix ...member of polarhome.com realm +irix.polarhome.com +irix.polarhome.com IRIX64 6.5 07202013 IP35 +irix.polarhome.com Welcome to irix ...member of polarhome.com realm +suse.polarhome.com +suse.polarhome.com openSUSE 11.4 "Celadon" +suse.polarhome.com Welcome to SuSE/openSUSE ...member of polarhome.com realm +suse.polarhome.com +suse.polarhome.com +suse.polarhome.com openSUSE 11.4 "Celadon" +suse.polarhome.com Welcome to SuSE/openSUSE ...member of polarhome.com realm +suse.polarhome.com +openindiana.polarhome.com +openindiana.polarhome.com OpenIndiana SunOS 5.11 +openindiana.polarhome.com Welcome to OpenIndiana ...member of polarhome.com realm +openindiana.polarhome.com +openindiana.polarhome.com +openindiana.polarhome.com OpenIndiana SunOS 5.11 +openindiana.polarhome.com Welcome to OpenIndiana ...member of polarhome.com realm +openindiana.polarhome.com +mandriva.polarhome.com +mandriva.polarhome.com Mandriva Linux release 2010.2 (Official) for x86_64 +mandriva.polarhome.com Welcome to Mandrake/Mandriva ...member of polarhome.com realm +mandriva.polarhome.com +mandriva.polarhome.com +mandriva.polarhome.com Mandriva Linux release 2010.2 (Official) for x86_64 +mandriva.polarhome.com Welcome to Mandrake/Mandriva ...member of polarhome.com realm +mandriva.polarhome.com +unixware.polarhome.com SCO UnixWare 7.1.4 +unixware.polarhome.com Welcome to unixware ...member of polarhome.com realm +unixware.polarhome.com +unixware.polarhome.com SCO UnixWare 7.1.4 +unixware.polarhome.com Welcome to unixware ...member of polarhome.com realm +unixware.polarhome.com +miros.polarhome.com +miros.polarhome.com MirBSD/i386 +miros.polarhome.com Welcome to MirOS ...member of polarhome.com realm +miros.polarhome.com +miros.polarhome.com +miros.polarhome.com MirBSD/i386 +miros.polarhome.com Welcome to MirOS ...member of polarhome.com realm +miros.polarhome.com +raspberrypi.polarhome.com Debian GNU/Linux 6.0 +raspberrypi.polarhome.com RaspberryPi/bcm2708 reference 2.0 +raspberrypi.polarhome.com Welcome to raspberrypi ...member of polarhome.com realm +raspberrypi.polarhome.com +raspberrypi.polarhome.com Debian GNU/Linux 6.0 +raspberrypi.polarhome.com RaspberryPi/bcm2708 reference 2.0 +raspberrypi.polarhome.com Welcome to raspberrypi ...member of polarhome.com realm +raspberrypi.polarhome.com +hurd.polarhome.com +hurd.polarhome.com Debian GNU/Hurd wheezy/sid +hurd.polarhome.com Welcome to hurd ...member of polarhome.com realm. +hurd.polarhome.com +hurd.polarhome.com +hurd.polarhome.com Debian GNU/Hurd wheezy/sid +hurd.polarhome.com Welcome to hurd ...member of polarhome.com realm. +hurd.polarhome.com +ubuntu.polarhome.com +ubuntu.polarhome.com Ubuntu 10.04.2 LTS +ubuntu.polarhome.com Welcome to Ubuntu ...member of polarhome.com realm +ubuntu.polarhome.com +ubuntu.polarhome.com +ubuntu.polarhome.com Ubuntu 10.04.2 LTS +ubuntu.polarhome.com Welcome to Ubuntu ...member of polarhome.com realm +ubuntu.polarhome.com Run the test on polarhome machines scosysv.polarhome.com SCO OpenServer(TM) Release 6 scosysv.polarhome.com Welcome to scosysv ...member of polarhome.com realm @@ -169,6 +201,8 @@ netbsd.polarhome.com netbsd.polarhome.com NetBSD 5.1 netbsd.polarhome.com Welcome to NetBSD ...member of polarhome.com realm netbsd.polarhome.com +netbsd.polarhome.com MANPATH: Undefined variable. +netbsd.polarhome.com MANPATH: Undefined variable. netbsd.polarhome.com Works on netbsd.polarhome.com freebsd.polarhome.com freebsd.polarhome.com FreeBSD 8.2 @@ -207,7 +241,7 @@ qnx.polarhome.com perl: No such file or directory irix.polarhome.com irix.polarhome.com IRIX64 6.5 07202013 IP35 irix.polarhome.com Welcome to irix ...member of polarhome.com realm -irix.polarhome.com Unknown open() mode '>&' at bin/parallel line 1271, <$fh> line 1. +irix.polarhome.com Unknown open() mode '>&' at bin/parallel line 1278, <$fh> line 1. suse.polarhome.com suse.polarhome.com openSUSE 11.4 "Celadon" suse.polarhome.com Welcome to SuSE/openSUSE ...member of polarhome.com realm @@ -229,6 +263,11 @@ unixware.polarhome.com SCO UnixWare 7.1.4 unixware.polarhome.com Welcome to unixware ...member of polarhome.com realm unixware.polarhome.com unixware.polarhome.com Works on unixware.polarhome.com +miros.polarhome.com +miros.polarhome.com MirBSD/i386 +miros.polarhome.com Welcome to MirOS ...member of polarhome.com realm +miros.polarhome.com +miros.polarhome.com Works on miros.polarhome.com raspberrypi.polarhome.com raspberrypi.polarhome.com CentOS release 5.6 (Final) raspberrypi.polarhome.com Welcome to CentOS ...member of polarhome.com realm diff --git a/testsuite/wanted-results/test15 b/testsuite/wanted-results/test15 index 4530e5e4..d00eca80 100644 --- a/testsuite/wanted-results/test15 +++ b/testsuite/wanted-results/test15 @@ -655,7 +655,7 @@ args on cmdline \nice -n1 /bin/bash -c PAR=a\ bash\ -c\ \"echo\ \ \\\$PAR\ b\" a b ### Test --nice remote -ssh one-server 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' \\nice\ -n1\ /bin/bash\ -c\ PAR=a\\\ bash\\\ -c\\\ \\\"echo\\\ \\\ \\\\\\\$PAR\\\ b\\\"; +ssh -tt -oLogLevel=quiet one-server 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' tty\ \>/dev/null\ \&\&\ stty\ isig\ -onlcr\ -echo\;\\nice\ -n1\ /bin/bash\ -c\ PAR=a\\\ bash\\\ -c\\\ \\\"echo\\\ \\\ \\\\\\\$PAR\\\ b\\\"; a b ### Test distribute arguments at EOF to 2 jobslots 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 diff --git a/testsuite/wanted-results/test19 b/testsuite/wanted-results/test19 index e824cb61..975674a3 100644 --- a/testsuite/wanted-results/test19 +++ b/testsuite/wanted-results/test19 @@ -76,7 +76,7 @@ ls: tmp/parallel.file*: No such file or directory OK Input for ssh -l parallel parallel-server1 rsync --server -lDrRze.iLsf . . -parallel@parallel-server1 eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ 2\; setenv PARALLEL_PID 00000 || echo PARALLEL_SEQ=2\;export PARALLEL_SEQ\; PARALLEL_PID=00000\;export PARALLEL_PID` ; cat tmp/parallel.file.' +-tt -oLogLevel=quiet parallel@parallel-server1 eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ 2\; setenv PARALLEL_PID 00000 || echo PARALLEL_SEQ=2\;export PARALLEL_SEQ\; PARALLEL_PID=00000\;export PARALLEL_PID` ; tty >/dev/null && stty isig -onlcr -echo;cat tmp/parallel.file.' 'newline2 > tmp/parallel.file.' 'newline2.out;cat tmp/parallel.file.' 'newline2 > tmp/parallel.file.' @@ -90,7 +90,7 @@ parallel@parallel-server1 rm -f ./tmp/parallel.file.' 'newline2.out;rmdir 2>/dev/null ./tmp;rm -f ./tmp/parallel.file.' 'newline2.out2;rmdir 2>/dev/null ./tmp; -l parallel parallel-server2 rsync --server -lDrRze.iLsf . . -parallel@parallel-server2 eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ 1\; setenv PARALLEL_PID 00000 || echo PARALLEL_SEQ=1\;export PARALLEL_SEQ\; PARALLEL_PID=00000\;export PARALLEL_PID` ; cat tmp/parallel.file.' +-tt -oLogLevel=quiet parallel@parallel-server2 eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ 1\; setenv PARALLEL_PID 00000 || echo PARALLEL_SEQ=1\;export PARALLEL_SEQ\; PARALLEL_PID=00000\;export PARALLEL_PID` ; tty >/dev/null && stty isig -onlcr -echo;cat tmp/parallel.file.' 'newline1 > tmp/parallel.file.' 'newline1.out;cat tmp/parallel.file.' 'newline1 > tmp/parallel.file.' diff --git a/testsuite/wanted-results/test21 b/testsuite/wanted-results/test21 index 83990c7d..b6a8d2f9 100644 --- a/testsuite/wanted-results/test21 +++ b/testsuite/wanted-results/test21 @@ -1,21 +1,21 @@ ### Test $PARALLEL - single line 1 -ssh -l parallel parallel-server2 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' echo\ 1; +ssh -l parallel -tt -oLogLevel=quiet parallel-server2 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' tty\ \>/dev/null\ \&\&\ stty\ isig\ -onlcr\ -echo\;echo\ 1; 1 -ssh parallel\@parallel-server3 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' echo\ 2; +ssh -tt -oLogLevel=quiet parallel\@parallel-server3 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' tty\ \>/dev/null\ \&\&\ stty\ isig\ -onlcr\ -echo\;echo\ 2; 2 ### Test $PARALLEL - multi line -ssh -l parallel parallel-server2 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' echo\ 1; +ssh -l parallel -tt -oLogLevel=quiet parallel-server2 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' tty\ \>/dev/null\ \&\&\ stty\ isig\ -onlcr\ -echo\;echo\ 1; 1 -ssh parallel\@parallel-server3 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' echo\ 2; +ssh -tt -oLogLevel=quiet parallel\@parallel-server3 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' tty\ \>/dev/null\ \&\&\ stty\ isig\ -onlcr\ -echo\;echo\ 2; 2 ### Test ~/.parallel/config - single line -ssh -l parallel parallel-server2 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' echo\ 1; +ssh -l parallel -tt -oLogLevel=quiet parallel-server2 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' tty\ \>/dev/null\ \&\&\ stty\ isig\ -onlcr\ -echo\;echo\ 1; 1 -ssh parallel\@parallel-server3 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' echo\ 2; +ssh -tt -oLogLevel=quiet parallel\@parallel-server3 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' tty\ \>/dev/null\ \&\&\ stty\ isig\ -onlcr\ -echo\;echo\ 2; 2 ### Test ~/.parallel/config - multi line -ssh -l parallel parallel-server2 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' echo\ 1; +ssh -l parallel -tt -oLogLevel=quiet parallel-server2 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' tty\ \>/dev/null\ \&\&\ stty\ isig\ -onlcr\ -echo\;echo\ 1; 1 -ssh parallel\@parallel-server3 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' echo\ 2; +ssh -tt -oLogLevel=quiet parallel\@parallel-server3 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' tty\ \>/dev/null\ \&\&\ stty\ isig\ -onlcr\ -echo\;echo\ 2; 2 diff --git a/testsuite/wanted-results/test37 b/testsuite/wanted-results/test37 index af131732..5dde43fb 100644 --- a/testsuite/wanted-results/test37 +++ b/testsuite/wanted-results/test37 @@ -42,7 +42,7 @@ echo /dev/fd/62 /dev/fd/62 echo foo foo -ssh parallel@parallel-server3 ssh parallel-server2 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' perl\ -pe\ \"\\\$a=1\;\ print\ \\\$a\"\ \<\(echo\ foo\); +ssh parallel@parallel-server3 ssh -tt -oLogLevel=quiet parallel-server2 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' tty\ \>/dev/null\ \&\&\ stty\ isig\ -onlcr\ -echo\;perl\ -pe\ \"\\\$a=1\;\ print\ \\\$a\"\ \<\(echo\ foo\); 1foo ### Test quoting of $ in command from profile file perl -pe '$a=1; print $a' <(echo foo) diff --git a/testsuite/wanted-results/test61 b/testsuite/wanted-results/test61 index 6de45735..62ec5edc 100644 --- a/testsuite/wanted-results/test61 +++ b/testsuite/wanted-results/test61 @@ -1,11 +1,11 @@ ### Test --return of weirdly named file -ssh parallel@parallel-server3 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' echo\ \>aa\\\<\\\$\\\{\\\#\\\}\\\"\\\ b;_EXIT_status=$?; mkdir -p .; rsync --rsync-path=cd\ ./.\;\ rsync -rlDzR -essh parallel@parallel-server3:aa\\\<\\\$\\\{\\\#\\\}\\\"\\\ b .; exit $_EXIT_status; +ssh -tt -oLogLevel=quiet parallel@parallel-server3 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' tty\ \>/dev/null\ \&\&\ stty\ isig\ -onlcr\ -echo\;echo\ \>aa\\\<\\\$\\\{\\\#\\\}\\\"\\\ b;_EXIT_status=$?; mkdir -p .; rsync --rsync-path=cd\ ./.\;\ rsync -rlDzR -essh parallel@parallel-server3:aa\\\<\\\$\\\{\\\#\\\}\\\"\\\ b .; exit $_EXIT_status; ### Test if remote login shell is csh -ssh csh@localhost 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' echo\ \$PARALLEL_PID\ \$PARALLEL_SEQ\ a\|\ wc\ -w; +ssh -tt -oLogLevel=quiet csh@localhost 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' tty\ \>/dev/null\ \&\&\ stty\ isig\ -onlcr\ -echo\;echo\ \$PARALLEL_PID\ \$PARALLEL_SEQ\ a\|\ wc\ -w; 3 -ssh csh@localhost 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' echo\ \$PARALLEL_PID\ \$PARALLEL_SEQ\ b\|\ wc\ -w; +ssh -tt -oLogLevel=quiet csh@localhost 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' tty\ \>/dev/null\ \&\&\ stty\ isig\ -onlcr\ -echo\;echo\ \$PARALLEL_PID\ \$PARALLEL_SEQ\ b\|\ wc\ -w; 3 -ssh csh@localhost 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' echo\ \$PARALLEL_PID\ \$PARALLEL_SEQ\ c\|\ wc\ -w; +ssh -tt -oLogLevel=quiet csh@localhost 'eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv PARALLEL_SEQ '$PARALLEL_SEQ'\; setenv PARALLEL_PID '$PARALLEL_PID' || echo PARALLEL_SEQ='$PARALLEL_SEQ'\;export PARALLEL_SEQ\; PARALLEL_PID='$PARALLEL_PID'\;export PARALLEL_PID` ;' tty\ \>/dev/null\ \&\&\ stty\ isig\ -onlcr\ -echo\;echo\ \$PARALLEL_PID\ \$PARALLEL_SEQ\ c\|\ wc\ -w; 3 ### Test {} multiple times in different commands echo 1 2 3 4 5 6 7 8 9 10 ; echo 1 2 3 4 5 6 7 8 9 10