From 0706a9580270da7cb784456af1a1f1a67f2ac892 Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Mon, 8 Apr 2013 21:17:59 +0200 Subject: [PATCH] testsuite: Polarhome added. --- doc/release_new_version | 3 +++ src/parallel | 2 +- testsuite/tests-to-run/parallel-polarhome.sh | 17 +++++++++++++++++ testsuite/tests-to-run/test47.sh | 1 + testsuite/tests-to-run/test60.sh | 2 +- testsuite/wanted-results/parallel-polarhome | 19 +++++++++++++++++++ testsuite/wanted-results/test15 | 2 +- testsuite/wanted-results/test61 | 8 ++++---- 8 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 testsuite/tests-to-run/parallel-polarhome.sh create mode 100644 testsuite/wanted-results/parallel-polarhome diff --git a/doc/release_new_version b/doc/release_new_version index ff46d71a..39bb6b62 100644 --- a/doc/release_new_version +++ b/doc/release_new_version @@ -214,6 +214,9 @@ New in this release: * GNU parallel is used throughout Scrimer http://scrimer.readthedocs.org/en/latest/ +* GNU Parallel helped making public documents searchable. + http://danpalmer.me/blog/articles/2013-04-06-unlocking-hillsborough.html + * Identifying big movie files (German). http://blackappsolutions.wordpress.com/2013/03/23/wenn-der-plattenplatz-knapp-wird-filme-identifizieren-die-viel-platz-belegen/ diff --git a/src/parallel b/src/parallel index e03a12c4..424013fc 100755 --- a/src/parallel +++ b/src/parallel @@ -646,7 +646,7 @@ sub get_options_from_array { sub parse_options { # Returns: N/A # Defaults: - $Global::version = 20130307; + $Global::version = 20130408; $Global::progname = 'parallel'; $Global::infinity = 2**31; $Global::debug = 0; diff --git a/testsuite/tests-to-run/parallel-polarhome.sh b/testsuite/tests-to-run/parallel-polarhome.sh new file mode 100644 index 00000000..e8b67765 --- /dev/null +++ b/testsuite/tests-to-run/parallel-polarhome.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +P="scosysv centos dragonfly netbsd freebsd solaris openbsd debian aix hpux redhat qnx irix suse minix openindiana mandriva unixware miros raspberrypi hurd ultrix ubuntu" +P="scosysv centos dragonfly netbsd freebsd solaris openbsd debian aix hpux qnx irix suse minix openindiana mandriva unixware miros raspberrypi hurd ultrix ubuntu" +#P="scosysv hpux qnx irix openindiana ultrix" +POLAR=`parallel echo {}.polarhome.com ::: $P` + +echo '### Tests on polarhome machines' +parallel -j0 ssh {} mkdir -p bin ::: $POLAR 2>/dev/null & +# scp to each polarhome machine do not work. From redhat it works. +rsync -a `which parallel` redhat.polarhome.com:bin/ +ssh redhat.polarhome.com \ + chmod 755 bin/parallel\; \ + bin/parallel -j0 ssh {} rm -f bin/parallel\\\;scp bin/parallel {}:bin/ ::: $POLAR +# Now test +parallel --argsep // -k --tag ssh {} bin/parallel echo Works on ::: {} // $POLAR + diff --git a/testsuite/tests-to-run/test47.sh b/testsuite/tests-to-run/test47.sh index b03b0153..da7eb05b 100644 --- a/testsuite/tests-to-run/test47.sh +++ b/testsuite/tests-to-run/test47.sh @@ -7,6 +7,7 @@ SSHLOGIN2=parallel@$SERVER2 # Minimal version of test17 +export PARALLEL=-j8 # Make sure sort order is the same export LANG=C diff --git a/testsuite/tests-to-run/test60.sh b/testsuite/tests-to-run/test60.sh index 81b5b2a1..1f57304d 100644 --- a/testsuite/tests-to-run/test60.sh +++ b/testsuite/tests-to-run/test60.sh @@ -20,7 +20,7 @@ echo '### Test --nonall'; parallel --nonall -k -S $SSHLOGIN1,$SSHLOGIN2 'hostname' | sort echo '### Test --nonall -u - should be interleaved x y x y'; - parallel --nonall -S $SSHLOGIN1,$SSHLOGIN2 -u 'hostname|grep -q redhat9 && sleep 3; hostname;sleep 6;hostname;' + parallel --nonall -S $SSHLOGIN1,$SSHLOGIN2 -u 'hostname|grep -q redhat9 && sleep 3; hostname;sleep 8;hostname;' echo '### Test read sshloginfile from STDIN'; echo $SSHLOGIN1 | parallel -S - --nonall hostname; diff --git a/testsuite/wanted-results/parallel-polarhome b/testsuite/wanted-results/parallel-polarhome new file mode 100644 index 00000000..16d859f2 --- /dev/null +++ b/testsuite/wanted-results/parallel-polarhome @@ -0,0 +1,19 @@ +### Tests on polarhome machines +scosysv.polarhome.com Works on scosysv.polarhome.com +centos.polarhome.com Works on centos.polarhome.com +dragonfly.polarhome.com Works on dragonfly.polarhome.com +netbsd.polarhome.com Works on netbsd.polarhome.com +freebsd.polarhome.com Works on freebsd.polarhome.com +solaris.polarhome.com Works on solaris.polarhome.com +openbsd.polarhome.com Works on openbsd.polarhome.com +debian.polarhome.com Works on debian.polarhome.com +aix.polarhome.com Works on aix.polarhome.com +suse.polarhome.com Works on suse.polarhome.com +minix.polarhome.com Works on minix.polarhome.com +openindiana.polarhome.com Works on openindiana.polarhome.com +mandriva.polarhome.com Works on mandriva.polarhome.com +unixware.polarhome.com Works on unixware.polarhome.com +miros.polarhome.com Works on miros.polarhome.com +raspberrypi.polarhome.com Works on raspberrypi.polarhome.com +hurd.polarhome.com Works on hurd.polarhome.com +ubuntu.polarhome.com Works on ubuntu.polarhome.com diff --git a/testsuite/wanted-results/test15 b/testsuite/wanted-results/test15 index 41d1af04..4530e5e4 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 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\\\"; 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/test61 b/testsuite/wanted-results/test61 index 7a250870..6de45735 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 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; ### 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 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; 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 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; 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 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; 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