diff options
| -rwxr-xr-x | selftest/selftest.pl | 1 | ||||
| -rw-r--r-- | selftest/target/Samba4.pm | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index a345401a0a..8b890982a1 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -832,6 +832,7 @@ sub setup_env($) } elsif (defined(get_running_env($envname))) { $testenv_vars = get_running_env($envname); if (not $target->check_env($testenv_vars)) { + print $self->getlog_env($testenv_vars); $testenv_vars = undef; } } else { 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($$$) |