diff options
| author | Volker Lendecke <vl@samba.org> | 2020-01-28 14:46:09 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2020-01-29 11:06:53 +0000 |
| commit | 3f0e0ee274fd6a64b67970c2b3c8dbe64ccb7781 (patch) | |
| tree | 94733285e6d73dcd15afd593926d123921034c0a /selftest | |
| parent | 5bc5b681c037ed1e8e119b7c062ab397bafb9571 (diff) | |
| download | samba-3f0e0ee274fd6a64b67970c2b3c8dbe64ccb7781.tar.gz | |
selftest: Exit skipped daemons on close(STDIN)
Without this, teardown_env() will take ages for environments with
skipped daemons
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Jan 29 11:06:53 UTC 2020 on sn-devel-184
Diffstat (limited to 'selftest')
| -rw-r--r-- | selftest/target/Samba.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index 216c13f11c1..a908a7ade7c 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -10,6 +10,7 @@ use target::Samba3; use target::Samba4; use POSIX; use Cwd qw(abs_path); +use IO::Poll qw(POLLIN); sub new($$$$$) { my ($classname, $bindir, $srcdir, $server_maxtime) = @_; @@ -677,7 +678,9 @@ sub fork_and_exec print("Skip $daemon_ctx->{NAME} received signal $signame"); exit 0; }; - sleep($self->{server_maxtime}); + my $poll = IO::Poll->new(); + $poll->mask($STDIN_READER, POLLIN); + $poll->poll($self->{server_maxtime}); exit 0; } |