diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-09-04 21:08:35 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-09-04 21:08:35 +0200 |
| commit | bde18c6218fa6b593ff4f3db8bcd2f83e9b661aa (patch) | |
| tree | 36e8efb280984b3ce16ded4a1d7b69e687346f9e /selftest/target | |
| parent | 3c2b733698507e33716a2f837d6b58c34bea9b78 (diff) | |
| download | samba-bde18c6218fa6b593ff4f3db8bcd2f83e9b661aa.tar.gz samba-bde18c6218fa6b593ff4f3db8bcd2f83e9b661aa.tar.bz2 samba-bde18c6218fa6b593ff4f3db8bcd2f83e9b661aa.zip | |
selftest: Don't make printing the log output a side-effect of check_env(), do it manually.
Diffstat (limited to 'selftest/target')
| -rw-r--r-- | selftest/target/Samba4.pm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index b4f826eac5..ad474b8bc9 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -141,7 +141,7 @@ sub check_or_start($$$) } unlink($env_vars->{SAMBA_TEST_FIFO}); my $exit = $? >> 8; - if ( $ret == 0 ) { + if ($ret == 0) { print "$samba exits with status $exit\n"; } elsif ( $ret & 127 ) { print "$samba got signal ".($ret & 127)." and exits with $exit!\n"; @@ -1127,11 +1127,7 @@ sub check_env($$) { my ($self, $envvars) = @_; - return 1 if (-p $envvars->{SAMBA_TEST_FIFO}); - - print $self->getlog_env($envvars); - - return 0; + return (-p $envvars->{SAMBA_TEST_FIFO}); } sub setup_env($$$) |