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

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index a345401a0a6875c71fe90dae1d6987e888f12fcf..8b890982a1021138c319857efae3df0d1f95471f 100755 (executable)
--- 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 b4f826eac5dda25abf9c12037709a66e83e288e4..ad474b8bc9ee64d99f0de7c56c6893980a8dd6d8 100644 (file)
--- 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($$$)