From 9fd2f95bf32e180997d6d487a87ab86b73884a4a Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Tue, 21 Feb 2012 20:06:23 +0000 Subject: [PATCH] OBS did not compile due to missing pod2texi. --- configure | 20 ++++++++++---------- configure.ac | 2 +- src/Makefile.am | 3 ++- src/Makefile.in | 3 ++- src/niceload | 2 +- src/parallel | 2 +- src/sql | 2 +- testsuite/tests-to-run/test42.sh | 7 +++++-- testsuite/tests-to-run/test60.sh | 10 ++++++++++ testsuite/wanted-results/test60 | 4 ++++ 10 files changed, 37 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 7d802e26..d8b54255 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 20120220. +# Generated by GNU Autoconf 2.68 for parallel 20120221. # # Report bugs to . # @@ -559,8 +559,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='parallel' PACKAGE_TARNAME='parallel' -PACKAGE_VERSION='20120220' -PACKAGE_STRING='parallel 20120220' +PACKAGE_VERSION='20120221' +PACKAGE_STRING='parallel 20120221' 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 20120220 to adapt to many kinds of systems. +\`configure' configures parallel 20120221 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 20120220:";; + short | recursive ) echo "Configuration of parallel 20120221:";; 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 20120220 +parallel configure 20120221 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 20120220, which was +It was created by parallel $as_me 20120221, 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='20120220' + VERSION='20120221' 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 20120220, which was +This file was extended by parallel $as_me 20120221, 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 20120220 +parallel config.status 20120221 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 7e36d223..fc009336 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([parallel], [20120220], [bug-parallel@gnu.org]) +AC_INIT([parallel], [20120221], [bug-parallel@gnu.org]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([ diff --git a/src/Makefile.am b/src/Makefile.am index af9dca8e..d8bb1681 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -60,4 +60,5 @@ DISTCLEANFILES = parallel.html sem.html sql.html niceload.html EXTRA_DIST = parallel sem sql niceload \ parallel.1 sem.1 sql.1 niceload.1 \ parallel.html sem.html sql.html niceload.html \ - sem.pod parallel.pod niceload.pod + sem.pod parallel.pod niceload.pod \ + parallel.texi sem.texi sql.texi niceload.texi diff --git a/src/Makefile.in b/src/Makefile.in index 176f3816..f4611b90 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -153,7 +153,8 @@ DISTCLEANFILES = parallel.html sem.html sql.html niceload.html EXTRA_DIST = parallel sem sql niceload \ parallel.1 sem.1 sql.1 niceload.1 \ parallel.html sem.html sql.html niceload.html \ - sem.pod parallel.pod niceload.pod + sem.pod parallel.pod niceload.pod \ + parallel.texi sem.texi sql.texi niceload.texi all: all-am diff --git a/src/niceload b/src/niceload index f3408534..dc2dbeda 100755 --- a/src/niceload +++ b/src/niceload @@ -24,7 +24,7 @@ use strict; use Getopt::Long; $Global::progname="niceload"; -$Global::version = 20120220; +$Global::version = 20120221; 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 acfb3b7f..b572523e 100755 --- a/src/parallel +++ b/src/parallel @@ -543,7 +543,7 @@ sub get_options_from_array { sub parse_options { # Returns: N/A # Defaults: - $Global::version = 20120220; + $Global::version = 20120221; $Global::progname = 'parallel'; $Global::infinity = 2**31; $Global::debug = 0; diff --git a/src/sql b/src/sql index d9a71f5d..96287582 100755 --- a/src/sql +++ b/src/sql @@ -556,7 +556,7 @@ $Global::Initfile && unlink $Global::Initfile; exit ($err); sub parse_options { - $Global::version = 20120220; + $Global::version = 20120221; $Global::progname = 'sql'; # This must be done first as this may exec myself diff --git a/testsuite/tests-to-run/test42.sh b/testsuite/tests-to-run/test42.sh index dea31f12..9fbd4e50 100644 --- a/testsuite/tests-to-run/test42.sh +++ b/testsuite/tests-to-run/test42.sh @@ -1,5 +1,9 @@ #!/bin/bash +SERVER1=parallel-server3 +SERVER2=parallel-server2 + +cat <<'EOF' | sed -e s/\$SERVER1/$SERVER1/\;s/\$SERVER2/$SERVER2/ | parallel -j0 -k echo "### Test --basenamereplace" parallel -j1 -k -X --basenamereplace FOO echo FOO ::: /a/b.c a/b.c b.c /a/b a/b b parallel -k --basenamereplace FOO echo FOO ::: /a/b.c a/b.c b.c /a/b a/b b @@ -30,9 +34,8 @@ parallel -j1 -k -X echo {2/} ::: /a/number1.c a/number2.c number3.c /a/number4 a echo "### Test {#.}" parallel -j1 -k -X echo {2.} ::: /a/number1.c a/number2.c number3.c /a/number4 a/number5 number6 +EOF -SERVER1=parallel-server3 -SERVER2=parallel-server2 rm -rf tmp echo "### Test combined -X --return {/}_{/.}_{#/.}_{#/}_{#.} with files containing space" diff --git a/testsuite/tests-to-run/test60.sh b/testsuite/tests-to-run/test60.sh index fdefdeec..4bc442bc 100644 --- a/testsuite/tests-to-run/test60.sh +++ b/testsuite/tests-to-run/test60.sh @@ -33,4 +33,14 @@ echo '### Test --nonall --basefile'; echo '### Test --onall --basefile'; touch /tmp/onall--basefile; parallel --onall --basefile /tmp/onall--basefile -S $SSHLOGIN1,$SSHLOGIN2 ls ::: /tmp/onall--basefile + +echo '### Test --workdir .'; + ssh $SSHLOGIN1 mkdir -p mydir; + mkdir -p $HOME/mydir; cd $HOME/mydir; + parallel --workdir . -S $SSHLOGIN1 ::: pwd + +echo '### Test --wd .'; + ssh $SSHLOGIN2 mkdir -p mydir; + mkdir -p $HOME/mydir; cd $HOME/mydir; + parallel --workdir . -S $SSHLOGIN2 ::: pwd EOF diff --git a/testsuite/wanted-results/test60 b/testsuite/wanted-results/test60 index ce737b9e..3ae34e86 100644 --- a/testsuite/wanted-results/test60 +++ b/testsuite/wanted-results/test60 @@ -66,3 +66,7 @@ vm1 ### Test --onall --basefile /tmp/onall--basefile /tmp/onall--basefile +### Test --workdir . +/home/parallel/mydir +### Test --wd . +/home/parallel/mydir