diff --git a/NEWS b/NEWS index 3d34ad7f..8d9fa300 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,16 @@ +20190122 + +* 'env_parallel --end-session' makes it possible to nest 'env_parallel + --session' + +* Using GNU Parallel in pentesting https://youtu.be/mZ0OUJmkIlA?t=873 + +* Supercomputer Workshop: Feb 1&7 + http://www.ece.unm.edu/featured-students/supercomputer-workshop-feb-17.html + +* Bug fixes and man page updates. + + 20181222 * Better /proc/cpuinfo parser. diff --git a/README b/README index 251b8b49..62f6838c 100644 --- a/README +++ b/README @@ -44,9 +44,9 @@ document. Full installation of GNU Parallel is as simple as: - wget https://ftpmirror.gnu.org/parallel/parallel-20181222.tar.bz2 - bzip2 -dc parallel-20181222.tar.bz2 | tar xvf - - cd parallel-20181222 + wget https://ftpmirror.gnu.org/parallel/parallel-20190122.tar.bz2 + bzip2 -dc parallel-20190122.tar.bz2 | tar xvf - + cd parallel-20190122 ./configure && make && sudo make install @@ -55,9 +55,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 https://ftpmirror.gnu.org/parallel/parallel-20181222.tar.bz2 - bzip2 -dc parallel-20181222.tar.bz2 | tar xvf - - cd parallel-20181222 + wget https://ftpmirror.gnu.org/parallel/parallel-20190122.tar.bz2 + bzip2 -dc parallel-20190122.tar.bz2 | tar xvf - + cd parallel-20190122 ./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 dbbd9461..6e8a8b89 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.69 for parallel 20181222. +# Generated by GNU Autoconf 2.69 for parallel 20190122. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='parallel' PACKAGE_TARNAME='parallel' -PACKAGE_VERSION='20181222' -PACKAGE_STRING='parallel 20181222' +PACKAGE_VERSION='20190122' +PACKAGE_STRING='parallel 20190122' PACKAGE_BUGREPORT='bug-parallel@gnu.org' PACKAGE_URL='' @@ -1214,7 +1214,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 20181222 to adapt to many kinds of systems. +\`configure' configures parallel 20190122 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1281,7 +1281,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of parallel 20181222:";; + short | recursive ) echo "Configuration of parallel 20190122:";; esac cat <<\_ACEOF @@ -1357,7 +1357,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -parallel configure 20181222 +parallel configure 20190122 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1374,7 +1374,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 20181222, which was +It was created by parallel $as_me 20190122, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2237,7 +2237,7 @@ fi # Define the identity of the package. PACKAGE='parallel' - VERSION='20181222' + VERSION='20190122' cat >>confdefs.h <<_ACEOF @@ -2880,7 +2880,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 20181222, which was +This file was extended by parallel $as_me 20190122, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2942,7 +2942,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 20181222 +parallel config.status 20190122 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ff33d6b9..5b35f5fc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([parallel], [20181222], [bug-parallel@gnu.org]) +AC_INIT([parallel], [20190122], [bug-parallel@gnu.org]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([ diff --git a/citation-notice-faq.txt b/doc/citation-notice-faq.txt similarity index 98% rename from citation-notice-faq.txt rename to doc/citation-notice-faq.txt index d5bf781e..c5b1623b 100644 --- a/citation-notice-faq.txt +++ b/doc/citation-notice-faq.txt @@ -32,7 +32,7 @@ It is even optional to run this, as GNU Parallel will work without having 'paral > I do not write scientific articles. Does the notice apply to me? -No. The notice only applies if you write scientific articles. +The notice is only relevant if you write scientific articles. > What shows citing software is an academic tradition? @@ -51,7 +51,7 @@ These links say: Yes, you should cite software, and if the author suggests a way If you feel the benefit from using GNU Parallel is too small to warrant a citation, then prove that by simply using another tool. If you replace your use of GNU Parallel with another tool, you obviously do not have to cite GNU Parallel. If it is too much work replacing the use of GNU Parallel, then it is a good indication that the benefit is big enough to warrant a citation. -> Do other software show how to cite? +> Do other software tools show how to cite? Here are other examples of software showing how to cite. Some of these refer to peer-reviewed articles - others do not: @@ -77,7 +77,7 @@ This principle has even been tested in court: http://www.inta.org/INTABulletin/Pages/GERMANYGeneralPublicLicenseDoesNotPermitUseofThird-PartyTrademarksforAdvertisingModifiedVersionsofOpen-SourceSoftware.aspx https://www.admody.com/urteilsdatenbank/cafe6fdaeed3/OLG-Duesseldorf_Urteil_vom_28-September-2010_Az_I-20-U-41-09 -Also know that if you fork GNU Parallel and remove the notice, you are not helping to fund further develpment. So if you like GNU Parallel and want it to be maintained in the future, then this is a bad idea, as it will give less funding. +Also know that if you fork GNU Parallel and remove the notice, you are not helping to fund further develpment. So if you like GNU Parallel and want it to be maintained in the future, then this is a bad idea, as it will lead to less funding. > How important is the notice for the survival of GNU Parallel? diff --git a/doc/release_new_version b/doc/release_new_version index 6910b510..3c85d8d0 100644 --- a/doc/release_new_version +++ b/doc/release_new_version @@ -213,10 +213,14 @@ GNU Parallel 20190122 ('') <<[stable]>> has been released. It is available for d Quote of the month: - <<>> + Ok! GNU Parallel is one of the best things out there. Almost as good as vanilla ice cream. + -- @coffe@mastodon.art + New in this release: +* 'env_parallel --end-session' makes it possible to nest 'env_parallel --session' + * Using GNU Parallel in pentesting https://youtu.be/mZ0OUJmkIlA?t=873 * Supercomputer Workshop: Feb 1&7 http://www.ece.unm.edu/featured-students/supercomputer-workshop-feb-17.html diff --git a/packager/obs/home:tange/parallel/.osc/_files b/packager/obs/home:tange/parallel/.osc/_files index dd9b1dcf..81195fa9 100644 --- a/packager/obs/home:tange/parallel/.osc/_files +++ b/packager/obs/home:tange/parallel/.osc/_files @@ -1,6 +1,6 @@ - - - - - + + + + + diff --git a/packager/obs/home:tange/parallel/.osc/parallel.spec b/packager/obs/home:tange/parallel/.osc/parallel.spec index c09353c8..6238d1b8 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: 20181222 +Version: 20190122 Release: 1.2 License: GPL Group: Productivity/File utilities diff --git a/packager/obs/home:tange/parallel/parallel.spec b/packager/obs/home:tange/parallel/parallel.spec index c09353c8..6238d1b8 100644 --- a/packager/obs/home:tange/parallel/parallel.spec +++ b/packager/obs/home:tange/parallel/parallel.spec @@ -1,7 +1,7 @@ Summary: Shell tool for executing jobs in parallel Name: parallel -Version: 20181222 +Version: 20190122 Release: 1.2 License: GPL Group: Productivity/File utilities diff --git a/src/env_parallel.pod b/src/env_parallel.pod index ebe08229..76a3b05c 100644 --- a/src/env_parallel.pod +++ b/src/env_parallel.pod @@ -99,6 +99,7 @@ Same as GNU B in addition to these: Undo last B<--session> + =item B<--record-env> Record all names currently defined to be ignored every time running diff --git a/src/niceload b/src/niceload index 6d10694b..0c382884 100755 --- a/src/niceload +++ b/src/niceload @@ -23,7 +23,7 @@ use strict; use Getopt::Long; $Global::progname="niceload"; -$Global::version = 20181223; +$Global::version = 20190122; Getopt::Long::Configure("bundling","require_order"); get_options_from_array(\@ARGV) || die_usage(); if($opt::version) { diff --git a/src/parallel_alternatives.pod b/src/parallel_alternatives.pod index 76e08bc4..e89fd528 100644 --- a/src/parallel_alternatives.pod +++ b/src/parallel_alternatives.pod @@ -1389,7 +1389,7 @@ Output can be buffered by using B<-d>. Output is buffered in memory, so big output can cause swapping and therefore be terrible slow or even cause out of memory. -https://github.com/gdm85/coshell +https://github.com/gdm85/coshell (Last checked: 2019-01) =head2 DIFFERENCES BETWEEN spread AND GNU Parallel @@ -1416,8 +1416,7 @@ B deals badly with input containing spaces. It buffers stdout, but not stderr. It buffers in RAM. {} does not work as replacement string. It does not support running functions. -B does not support composed commands if run with B<--lines>, -and fails on B. +B does not support composed commands if run with B<--lines>. =head3 Examples @@ -1450,7 +1449,7 @@ and fails on B. # Similar, but not exactly the same parallel seq ::: 1 2 3 4 5 6 -https://github.com/robertblackwell/pyargs +https://github.com/robertblackwell/pyargs (Last checked: 2019-01) =head2 DIFFERENCES BETWEEN concurrently AND GNU Parallel @@ -1718,18 +1717,32 @@ dependency graph described in a file, so this is similar to B. https://github.com/cetra3/lorikeet (Last checked: 2018-10) + =head2 DIFFERENCES BETWEEN spp AND GNU Parallel B can run jobs in parallel. B does not use a command template to generate the jobs, but requires jobs to be in a file. Output from the jobs mix. -https://github.com/john01dav/spp +https://github.com/john01dav/spp (Last checked: 2019-01) + =head2 Todo Url for spread +https://github.com/reggi/pkgrun + +https://github.com/benoror/better-npm-run + +https://github.com/bahmutov/with-package + +https://github.com/spion/npm-parallel + +https://github.com/royriojas/shell-executor + +https://github.com/darkguy2008/parallelshell + https://github.com/xuchenCN/go-pssh https://github.com/amritb/with-this.git @@ -1751,8 +1764,6 @@ https://github.com/amattn/paral https://github.com/mmstick/concurr -pyargs - =head1 TESTING OTHER TOOLS diff --git a/src/sql b/src/sql index 4444ea54..515a1805 100755 --- a/src/sql +++ b/src/sql @@ -574,7 +574,7 @@ $Global::Initfile && unlink $Global::Initfile; exit ($err); sub parse_options { - $Global::version = 20181223; + $Global::version = 20190122; $Global::progname = 'sql'; # This must be done first as this may exec myself diff --git a/testsuite/tests-to-run/parallel-local-30s.sh b/testsuite/tests-to-run/parallel-local-30s.sh index 39112032..6db0b890 100755 --- a/testsuite/tests-to-run/parallel-local-30s.sh +++ b/testsuite/tests-to-run/parallel-local-30s.sh @@ -82,7 +82,7 @@ linebuffer_matters() { # Ignore certain warnings # parallel: Warning: Starting 11 processes took > 2 sec. # parallel: Warning: Consider adjusting -j. Press CTRL-C to stop. - grep -v '^parallel: Warning: (Starting|Consider)' + grep -v '^parallel: Warning: (Starting|Consider)' >&2 } parallel -j0 $linebuffer --compress $TAG \ @@ -171,7 +171,7 @@ par_test_detected_shell() { } export -f test_known_shell_pipe - stdout parallel -j0 --tag -k \ + stdout parallel -j2 --tag -k \ ::: test_unknown_shell test_known_shell_c test_known_shell_pipe \ ::: $shells | grep -Ev 'parallel: Warning: (Starting .* processes took|Consider adjusting)' @@ -195,7 +195,7 @@ par_linebuffer_files() { rm -rf "/tmp/par48658-$compress" } export -f doit - parallel --tag -k doit ::: zstd pzstd clzip lz4 lzop pigz pxz gzip plzip pbzip2 lzma xz lzip bzip2 lbzip2 lrz + parallel -j1 --tag -k doit ::: zstd pzstd clzip lz4 lzop pigz pxz gzip plzip pbzip2 lzma xz lzip bzip2 lbzip2 lrz } par_no_newline_compress() { @@ -217,7 +217,7 @@ par_no_newline_compress() { echo "K" } export -f nopipe_doit - parallel -qk --header : {pipe}_doit {tagstring} {compress} \ + parallel -j1 -qk --header : {pipe}_doit {tagstring} {compress} \ ::: tagstring '--tagstring {#}' -k \ ::: compress --compress -k \ ::: pipe pipe nopipe diff --git a/testsuite/tests-to-run/parallel-local-race01.sh b/testsuite/tests-to-run/parallel-local-race01.sh index 46857ca9..a9d00749 100755 --- a/testsuite/tests-to-run/parallel-local-race01.sh +++ b/testsuite/tests-to-run/parallel-local-race01.sh @@ -1,5 +1,47 @@ #!/bin/bash +par_parcat_mixing() { + echo 'parcat output should mix: a b a b' + mktmpfifo() { + tmp=$(tempfile) + rm $tmp + mkfifo $tmp + echo $tmp + } + slow_output() { + string=$1 + perl -e 'print "'$string'"x9000,"start\n"' + sleep 2 + perl -e 'print "'$string'"x9000,"end\n"' + } + tmp1=$(mktmpfifo) + tmp2=$(mktmpfifo) + slow_output a > $tmp1 & + sleep 1 + slow_output b > $tmp2 & + parcat $tmp1 $tmp2 | tr -s ab +} + +par_tmux_termination() { + echo '### --tmux test - check termination' + doit() { + perl -e 'map {printf "$_%o%c\n",$_,$_}1..255' | + stdout parallel --tmux 'sleep 0.2;echo {}' :::: - ::: a b | + perl -pe 's:(/tmp\S*/tms).....:$1XXXXX:;' + } + export -f doit + stdout parallel --timeout 120 doit ::: 1 +} + +par_linebuffer_tag_slow_output() { + echo "Test output tag with mixing halflines" + halfline() { + perl -e '$| = 1; map { print $ARGV[0]; sleep(1); print "$_\n" } split //, "Half\n"' $1 + } + export -f halfline + parallel --delay 0.5 -j0 --tag --line-buffer halfline ::: a b +} + par_distribute_input_by_ability() { echo "### bug #48290: round-robin does not distribute data based on business" echo "### Distribute input to jobs that are ready" diff --git a/testsuite/tests-to-run/parallel-local-race02.sh b/testsuite/tests-to-run/parallel-local-race02.sh index 725d1b6c..dc451555 100644 --- a/testsuite/tests-to-run/parallel-local-race02.sh +++ b/testsuite/tests-to-run/parallel-local-race02.sh @@ -29,50 +29,6 @@ echo 1=OK $?' | grep -v '\[1\]' | grep -v 'SHA256' #} -par_parcat_mixing() { - echo 'parcat output should mix: a b a b' - mktmpfifo() { - tmp=$(tempfile) - rm $tmp - mkfifo $tmp - echo $tmp - } - slow_output() { - string=$1 - perl -e 'print "'$string'"x9000,"start\n"' - sleep 2 - perl -e 'print "'$string'"x9000,"end\n"' - } - tmp1=$(mktmpfifo) - tmp2=$(mktmpfifo) - slow_output a > $tmp1 & - sleep 1 - slow_output b > $tmp2 & - parcat $tmp1 $tmp2 | tr -s ab -} - -par_testhalt() { - testhalt_false() { - echo '### testhalt --halt '$1; - (yes 0 | head -n 10; seq 10) | - stdout parallel -kj4 --delay 0.27 --halt $1 \ - 'echo job {#}; sleep {= $_=0.3*($_+1+seq()) =}; exit {}'; echo $?; - } - testhalt_true() { - echo '### testhalt --halt '$1; - (seq 10; yes 0 | head -n 10) | - stdout parallel -kj4 --delay 0.17 --halt $1 \ - 'echo job {#}; sleep {= $_=0.3*($_+1+seq()) =}; exit {}'; echo $?; - }; - export -f testhalt_false; - export -f testhalt_true; - - stdout parallel -kj0 --delay 0.11 --tag testhalt_{4} {1},{2}={3} \ - ::: now soon ::: fail success done ::: 0 1 2 30% 70% ::: true false | - # Remove lines that only show up now and then - perl -ne '/Starting no more jobs./ or print' -} - par_hostgroup() { echo '### --hostgroup force ncpu' parallel --delay 0.1 --hgrp -S @g1/1/parallel@lo -S @g2/3/lo whoami\;sleep 0.4{} ::: {1..8} | sort @@ -105,24 +61,26 @@ par_hostgroup() { parallel -S @g1+g2 -S @g1/1/tcsh@lo -S @g1/1/localhost -S @g2/1/parallel@lo whoami\;true ::: {1..6} | sort } -par_tmux_termination() { - echo '### --tmux test - check termination' - doit() { - perl -e 'map {printf "$_%o%c\n",$_,$_}1..255' | - stdout parallel --tmux 'sleep 0.2;echo {}' :::: - ::: a b | - perl -pe 's:(/tmp\S*/tms).....:$1XXXXX:;' +par_testhalt() { + testhalt_false() { + echo '### testhalt --halt '$1; + (yes 0 | head -n 10; seq 10) | + stdout parallel -kj4 --delay 0.27 --halt $1 \ + 'echo job {#}; sleep {= $_=0.3*($_+1+seq()) =}; exit {}'; echo $?; } - export -f doit - stdout parallel --timeout 120 doit ::: 1 -} + testhalt_true() { + echo '### testhalt --halt '$1; + (seq 10; yes 0 | head -n 10) | + stdout parallel -kj4 --delay 0.17 --halt $1 \ + 'echo job {#}; sleep {= $_=0.3*($_+1+seq()) =}; exit {}'; echo $?; + }; + export -f testhalt_false; + export -f testhalt_true; -par_linebuffer_tag_slow_output() { - echo "Test output tag with mixing halflines" - halfline() { - perl -e '$| = 1; map { print $ARGV[0]; sleep(1); print "$_\n" } split //, "Half\n"' $1 - } - export -f halfline - parallel --delay 0.5 -j0 --tag --line-buffer halfline ::: a b + stdout parallel -kj0 --delay 0.11 --tag testhalt_{4} {1},{2}={3} \ + ::: now soon ::: fail success done ::: 0 1 2 30% 70% ::: true false | + # Remove lines that only show up now and then + perl -ne '/Starting no more jobs./ or print' } par_continuous_output() { diff --git a/testsuite/tests-to-run/parallel-local-sql.sh b/testsuite/tests-to-run/parallel-local-sql.sh index 83fd35b0..0f90debf 100755 --- a/testsuite/tests-to-run/parallel-local-sql.sh +++ b/testsuite/tests-to-run/parallel-local-sql.sh @@ -148,5 +148,5 @@ export -f $(compgen -A function | egrep 'p_|par_') # Tested that -j0 in parallel is fastest (up to 15 jobs) # more than 3 jobs: sqlite locks compgen -A function | grep par_ | LC_ALL=C sort | - stdout parallel --timeout 60 -vj50% -k --tag --joblog /tmp/jl-`basename $0` p_wrapper \ + stdout parallel --timeout 100 -vj50% -k --tag --joblog /tmp/jl-`basename $0` p_wrapper \ :::: - ::: \$MYSQL \$PG \$SQLITE diff --git a/testsuite/tests-to-run/parallel-local-ssh9.sh b/testsuite/tests-to-run/parallel-local-ssh9.sh index 21392b84..e7bea745 100644 --- a/testsuite/tests-to-run/parallel-local-ssh9.sh +++ b/testsuite/tests-to-run/parallel-local-ssh9.sh @@ -173,7 +173,7 @@ par_no_route_to_host() { perl -ne 's/ssh:.* host (\d+\.\d+\.\d+\.\d+) .* No route .*/$1/ and print; $|=1' } - # Retry if really fails this fast + # Retry if the hosts really fails this fast filterhosts() { stdout parallel --timeout 2 -j5 ssh {} echo | perl -ne 's/ssh:.* host (\d+\.\d+\.\d+\.\d+) .* No route .*/$1/ and print; $|=1' @@ -181,6 +181,7 @@ par_no_route_to_host() { ( # Cache a list of hosts that fail fast with 'No route' + # Filter the list 4 times to make sure to get good hosts renice 10 -p $$ >/dev/null findhosts | filterhosts | filterhosts | filterhosts | filterhosts | head > /tmp/filtered.$$ diff --git a/testsuite/wanted-results/parallel-local-race01 b/testsuite/wanted-results/parallel-local-race01 index 2d218c3d..7adb96ae 100644 --- a/testsuite/wanted-results/parallel-local-race01 +++ b/testsuite/wanted-results/parallel-local-race01 @@ -8,6 +8,24 @@ par_distribute_input_by_ability 4 par_distribute_input_by_ability 5 par_distribute_input_by_ability 6 par_distribute_input_by_ability 7 +par_linebuffer_tag_slow_output Test output tag with mixing halflines +par_linebuffer_tag_slow_output a aH +par_linebuffer_tag_slow_output b bH +par_linebuffer_tag_slow_output a aa +par_linebuffer_tag_slow_output b ba +par_linebuffer_tag_slow_output a al +par_linebuffer_tag_slow_output b bl +par_linebuffer_tag_slow_output a af +par_linebuffer_tag_slow_output b bf +par_linebuffer_tag_slow_output a a +par_linebuffer_tag_slow_output a +par_linebuffer_tag_slow_output b b +par_linebuffer_tag_slow_output b +par_parcat_mixing parcat output should mix: a b a b +par_parcat_mixing astart +par_parcat_mixing bstart +par_parcat_mixing aend +par_parcat_mixing bend par_print_before_halt_on_error ### What is printed before the jobs are killed par_print_before_halt_on_error -2 exit code 0 par_print_before_halt_on_error -2 0.1 0.1 @@ -61,3 +79,5 @@ par_print_before_halt_on_error 2 exit code 1 par_print_before_halt_on_error 2 0.1 0.1 par_print_before_halt_on_error 2 parallel: This job failed: par_print_before_halt_on_error 2 perl -e 'sleep 1; sleep $ARGV[0]; print STDERR "",@ARGV,"\n"; 2 > 0 ? exit shift : exit not shift;' 1 +par_tmux_termination ### --tmux test - check termination +par_tmux_termination See output with: tmux -S /tmp/parallel-local-race01-tmpdir/tmsXXXXX attach diff --git a/testsuite/wanted-results/parallel-local-race02 b/testsuite/wanted-results/parallel-local-race02 index 831ad3e5..af2e39c5 100644 --- a/testsuite/wanted-results/parallel-local-race02 +++ b/testsuite/wanted-results/parallel-local-race02 @@ -104,24 +104,6 @@ par_hostgroup tange par_hostgroup tange par_hostgroup tcsh par_hostgroup tcsh -par_linebuffer_tag_slow_output Test output tag with mixing halflines -par_linebuffer_tag_slow_output a aH -par_linebuffer_tag_slow_output b bH -par_linebuffer_tag_slow_output a aa -par_linebuffer_tag_slow_output b ba -par_linebuffer_tag_slow_output a al -par_linebuffer_tag_slow_output b bl -par_linebuffer_tag_slow_output a af -par_linebuffer_tag_slow_output b bf -par_linebuffer_tag_slow_output a a -par_linebuffer_tag_slow_output a -par_linebuffer_tag_slow_output b b -par_linebuffer_tag_slow_output b -par_parcat_mixing parcat output should mix: a b a b -par_parcat_mixing astart -par_parcat_mixing bstart -par_parcat_mixing aend -par_parcat_mixing bend par_testhalt now fail 0 true ### testhalt --halt now,fail=0 par_testhalt now fail 0 true job 1 par_testhalt now fail 0 true parallel: This job failed: @@ -1462,5 +1444,3 @@ par_testhalt soon done 70% false job 17 par_testhalt soon done 70% false parallel: This job finished: par_testhalt soon done 70% false echo job 17; sleep 7.5; exit 7 par_testhalt soon done 70% false 20 -par_tmux_termination ### --tmux test - check termination -par_tmux_termination See output with: tmux -S /tmp/parallel-local-race02-tmpdir/tmsXXXXX attach