From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 4 Sep 2010 19:08:35 +0000 (+0200)
Subject: selftest: Don't make printing the log output a side-effect of check_env(), do it... 
X-Git-Tag: samba-4.0.0alpha13~496
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=bde18c6218fa6b593ff4f3db8bcd2f83e9b661aa;p=samba.git

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

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index a345401a0a6..8b890982a10 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 b4f826eac5d..ad474b8bc9e 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($$$)