diff options
author | Stephan Krempel <krempel@par-tec.com> | 2013-01-25 02:48:46 +0000 |
---|---|---|
committer | Pádraig Brady <P@draigBrady.com> | 2013-01-26 02:38:52 +0000 |
commit | f8c0258d4643dbabc461a84d0b940be44a680a9b (patch) | |
tree | a693b5ef23d5314a2aa835f8aea213a828b16530 /tests/misc | |
parent | 2238ab574191d30b89a007b760c616efaf9c219c (diff) | |
download | coreutils-f8c0258d4643dbabc461a84d0b940be44a680a9b.tar.xz |
timeout: ensure a blocked SIGALRM from the parent is unblocked
* src/timeout.c (unblock_signal): A new function to unblock a
specified signal, or warn if not possible.
(set_timeout): Ensure SIGALRM is unblocked before we setup the timer.
* tests/misc/timeout-blocked.pl: A new test for the issue.
* tests/local.mk: Reference the new test.
* NEWS: Mention the fix.
Fixes: http://bugs.gnu.org/13535
Diffstat (limited to 'tests/misc')
-rwxr-xr-x | tests/misc/timeout-blocked.pl | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/tests/misc/timeout-blocked.pl b/tests/misc/timeout-blocked.pl new file mode 100755 index 000000000..6f16ba4c8 --- /dev/null +++ b/tests/misc/timeout-blocked.pl @@ -0,0 +1,48 @@ +#!/usr/bin/perl +# Test that timeout handles blocked SIGALRM from its parent. + +# Copyright (C) 2013 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +use strict; + +(my $ME = $0) =~ s|.*/||; + +eval { require POSIX; }; +$@ + and CuSkip::skip "$ME: this script requires Perl's POSIX module\n"; + +use POSIX qw(:signal_h); +my $sigset = POSIX::SigSet->new(SIGALRM); # define the signals to block +my $old_sigset = POSIX::SigSet->new; # where the old sigmask will be kept +unless (defined sigprocmask(SIG_BLOCK, $sigset, $old_sigset)) { + CuSkip::skip "$ME: sigprocmask failed; skipped"; +} + +my @Tests = + ( + # test-name, [option, option, ...] {OUT=>"expected-output"} + # + + ['block-alrm', ".1 sleep 10", {EXIT => 124}], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'timeout'; +my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); + +exit $fail; |