From ad163a999e150c07169f6d7f13f375ab2f638138 Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Fri, 2 Jan 2015 11:06:32 +0100 Subject: [PATCH] sem: --fg --line-buffer failed. --- src/parallel | 6 +++--- testsuite/tests-to-run/sem01.sh | 3 +++ testsuite/wanted-results/sem01 | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/parallel b/src/parallel index 57bd913d..9399337e 100755 --- a/src/parallel +++ b/src/parallel @@ -5450,9 +5450,9 @@ sub set_non_blocking { for my $fdno (1,2) { my $fdr = $self->fh($fdno,'r'); my $flags; - fcntl($fdr, &F_GETFL, $flags) || die $!; # Get the current flags on the filehandle - $flags |= &O_NONBLOCK; # Add non-blocking to the flags - fcntl($fdr, &F_SETFL, $flags) || die $!; # Set the flags on the filehandle + fcntl($fdr, &::F_GETFL, $flags) || die $!; # Get the current flags on the filehandle + $flags |= &::O_NONBLOCK; # Add non-blocking to the flags + fcntl($fdr, &::F_SETFL, $flags) || die $!; # Set the flags on the filehandle } } diff --git a/testsuite/tests-to-run/sem01.sh b/testsuite/tests-to-run/sem01.sh index 5efb9c17..31f64af7 100755 --- a/testsuite/tests-to-run/sem01.sh +++ b/testsuite/tests-to-run/sem01.sh @@ -42,3 +42,6 @@ sem --wait echo '### Test bug #33621: --bg -p should give an error message' stdout parallel -p --bg echo x{} + +echo '### Failed on 20141226' +sem --fg --line-buffer --id lock_id echo OK diff --git a/testsuite/wanted-results/sem01 b/testsuite/wanted-results/sem01 index c91ae202..b8c18b52 100644 --- a/testsuite/wanted-results/sem01 +++ b/testsuite/wanted-results/sem01 @@ -96,3 +96,5 @@ done 4 40 ### Test bug #33621: --bg -p should give an error message parallel: Error: Jobs running in the background cannot be interactive. +### Failed on 20141226 +OK