From 0d94d681c4a829b2a0bdadf5800c11c05edd2fa4 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 2 Mar 2012 18:01:13 +1100 Subject: selftest: Put stdin pipe on the environment This seems to help us close the right pipe at cleanup time. Andrew Bartlett --- selftest/target/Samba4.pm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'selftest/target') diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 12c7e0a905..361152b928 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -158,7 +158,7 @@ sub check_or_start($$$) } print "DONE\n"; - open(DATA, ">$env_vars->{SAMBA_TEST_FIFO}"); + open($env_vars->{STDIN_PIPE}, ">$env_vars->{SAMBA_TEST_FIFO}"); return $pid; } @@ -1354,20 +1354,19 @@ sub teardown_env($$) my ($self, $envvars) = @_; my $pid; - close(DATA); + # This should cause samba to terminate gracefully + close($envvars->{STDIN_PIPE}); if (open(IN, "<$envvars->{PIDDIR}/samba.pid")) { $pid = ; close(IN); - - # Give the process 20 seconds to exit. gcov needs - # this time to write out the covarge data my $count = 0; + until (kill(0, $pid) == 0) { - # if no process sucessfully signalled, then we are done - sleep(1); - $count++; - last if $count > 20; + # This should give it time to write out the gcov data + sleep(1); + $count++; + last if $count > 20; } # If it is still around, kill it -- cgit