sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

r22356: Simple refactoring.

Browse Source 
(This used to be commit 913aa17b02)
This commit is contained in:
Jelmer Vernooij 2007-04-19 01:23:09 +00:00 committed by Gerald (Jerry) Carter
parent c8151033bf
commit efe1883d9b
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source4/script/tests/selftest.pl
View File

@ -672,6 +672,12 @@ sub teardown_env($)
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 @@ NETBIOSNAME=\$NETBIOSNAME\" && bash'");
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 $end = time();
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) {