sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

selftest: Don't make printing the log output a side-effect of check_env(), do it manually.

Browse Source
This commit is contained in:
Jelmer Vernooij 2010-09-04 21:08:35 +02:00
parent 3c2b733698
commit bde18c6218
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selftest/selftest.pl
View File

@ -832,6 +832,7 @@ sub setup_env($)
} elsif (defined(get_running_env($envname))) { } elsif (defined(get_running_env($envname))) {
$testenv_vars = get_running_env($envname); $testenv_vars = get_running_env($envname);
if (not $target->check_env($testenv_vars)) { if (not $target->check_env($testenv_vars)) {
print $self->getlog_env($testenv_vars);
$testenv_vars = undef; $testenv_vars = undef;
} }
} else { } else {

8
selftest/target/Samba4.pm
View File

@ -141,7 +141,7 @@ sub check_or_start($$$)
} }
unlink($env_vars->{SAMBA_TEST_FIFO}); unlink($env_vars->{SAMBA_TEST_FIFO});
my $exit = $? >> 8; my $exit = $? >> 8;
if ( $ret == 0 ) { if ($ret == 0) {
print "$samba exits with status $exit\n"; print "$samba exits with status $exit\n";
} elsif ( $ret & 127 ) { } elsif ( $ret & 127 ) {
print "$samba got signal ".($ret & 127)." and exits with $exit!\n"; print "$samba got signal ".($ret & 127)." and exits with $exit!\n";
@ -1127,11 +1127,7 @@ sub check_env($$)
{ {
my ($self, $envvars) = @_; my ($self, $envvars) = @_;
return 1 if (-p $envvars->{SAMBA_TEST_FIFO}); return (-p $envvars->{SAMBA_TEST_FIFO});
print $self->getlog_env($envvars);
return 0;
} }
sub setup_env($$$) sub setup_env($$$)