Rev 11920: Simple refactoring. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba/SAMBA_4_0/

------------------------------------------------------------
revno: 11920
revision-id: jelmer at samba.org-20070419005219-xhzck81g2odsayyq
parent: svn-v2:22346 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Thu 2007-04-19 02:52:19 +0200
message:
  Simple refactoring.
modified:
  source/script/tests/selftest.pl svn-v2:20693 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2fselftest.pl
=== modified file 'source/script/tests/selftest.pl'
--- a/source/script/tests/selftest.pl	2007-04-18 14:43:05 +0000
+++ b/source/script/tests/selftest.pl	2007-04-19 00:52:19 +0000
@@ -672,6 +672,12 @@
 	delete $running_envs{$envname};
 }
 
+my $msg_ops;
+if ($from_build_farm) {
+	$msg_ops = $buildfarm_msg_ops;
+} else {
+	$msg_ops = $plain_msg_ops;
+}
 
 if ($opt_testenv) {
 	my $testenv_vars = setup_env("dc");
@@ -708,12 +714,8 @@
 		my $pcap_file = "$pcap_dir/$shname.cap";
 
 		SocketWrapper::setup_pcap($pcap_file) if ($opt_socket_wrapper_pcap);
-		my $result;
-		if ($from_build_farm) {
-			$result = run_test($envname, $name, $cmd, $i, $suitestotal, $buildfarm_msg_ops);
-		} else {
-			$result = run_test($envname, $name, $cmd, $i, $suitestotal, $plain_msg_ops);
-		}
+		my $result = run_test($envname, $name, $cmd, $i, $suitestotal, 
+							  $msg_ops);
 
 		if ($opt_socket_wrapper_pcap and $result and 
 			not $opt_socket_wrapper_keep_pcap) {
@@ -738,7 +740,8 @@
 my $duration = ($end-$start);
 my $numfailed = $#$suitesfailed+1;
 if ($numfailed == 0) {
-	my $ok = $statistics->{TESTS_EXPECTED_OK} + $statistics->{TESTS_EXPECTED_FAIL};
+	my $ok = $statistics->{TESTS_EXPECTED_OK} + 
+	         $statistics->{TESTS_EXPECTED_FAIL};
 	print "ALL OK ($ok tests in $statistics->{SUITES_OK} testsuites)\n";
 } else {
 	unless ($from_build_farm) {