tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-29 09:27:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parallel: Fixed regression bug.

Browse source
This commit is contained in:
Ole Tange 2012-01-11 23:07:31 +01:00
parent c34e6c489c
commit 7d75bde672
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/parallel
View file

@ -541,7 +541,7 @@ sub get_options_from_array {
sub parse_options { sub parse_options {
# Returns: N/A # Returns: N/A
# Defaults: # Defaults:
$Global::version = 20120107; $Global::version = 20120111;
$Global::progname = 'parallel'; $Global::progname = 'parallel';
$Global::infinity = 2**31; $Global::infinity = 2**31;
$Global::debug = 0; $Global::debug = 0;
@ -4684,7 +4684,10 @@ sub nest_get {
# forget the value after first use. # forget the value after first use.
if($no_of_inputsources == 1) { if($no_of_inputsources == 1) {
my $arg = read_arg_from_fh($self->{'fhs'}[0]); my $arg = read_arg_from_fh($self->{'fhs'}[0]);
return [$arg]; if(defined($arg)) {
return [$arg];
}
return undef;
} }
for (my $fhno = $no_of_inputsources - 1; $fhno >= 0; $fhno--) { for (my $fhno = $no_of_inputsources - 1; $fhno >= 0; $fhno--) {
if(eof($self->{'fhs'}[$fhno])) { if(eof($self->{'fhs'}[$fhno])) {

2
testsuite/tests-to-run/test45.sh
View file

@ -33,7 +33,7 @@ echo '### Bug in --load';
parallel -k --load 30 sleep 0.1\;echo ::: 1 2 3 parallel -k --load 30 sleep 0.1\;echo ::: 1 2 3
echo '### Test --timeout'; echo '### Test --timeout';
parallel -j0 -k --timeout 1 echo {}\; sleep {}\; echo {} ::: 1.1 3.3 4.4 5.5 parallel -j0 -k --timeout 1 echo {}\; sleep {}\; echo {} ::: 1.1 6.6 7.7 8.8
echo '### Test retired'; echo '### Test retired';
stdout parallel -B; stdout parallel -B;

5
testsuite/wanted-results/test45
View file

@ -16,10 +16,9 @@ OK
### Test --timeout ### Test --timeout
1.1 1.1
1.1 1.1
3.3
3.3
4.4
5.5 5.5
6.6
7.7
### Test retired ### Test retired
parallel: -g has been retired. Use --group. parallel: -g has been retired. Use --group.
parallel: -B has been retired. Use --bf. parallel: -B has been retired. Use --bf.