[SCM] Samba Shared Repository - branch master updated -
2121c1bb2967f0aa8cc6903c507eb2c22a25b341
Jelmer Vernooij
jelmer at samba.org
Sun Sep 21 21:13:05 GMT 2008
The branch, master has been updated
via 2121c1bb2967f0aa8cc6903c507eb2c22a25b341 (commit)
via afa850910ff7845b2c8b19fdcf6fbb703e42d2db (commit)
via beee9debeab72ce172575be6a93f1fb712bb6026 (commit)
from 73aebd7d070099d4d6d6da98817f42937bc7fd03 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2121c1bb2967f0aa8cc6903c507eb2c22a25b341
Merge: afa850910ff7845b2c8b19fdcf6fbb703e42d2db 73aebd7d070099d4d6d6da98817f42937bc7fd03
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Sep 21 23:11:30 2008 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit afa850910ff7845b2c8b19fdcf6fbb703e42d2db
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Sep 21 23:09:56 2008 +0200
Avoid printing characters when in immediate mode.
commit beee9debeab72ce172575be6a93f1fb712bb6026
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Sep 21 22:26:44 2008 +0200
Print status (one character per test) when not running selftest with --immediate.
-----------------------------------------------------------------------
Summary of changes:
source4/selftest/output/plain.pm | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/selftest/output/plain.pm b/source4/selftest/output/plain.pm
index 4bec4e0..4e1e290 100644
--- a/source4/selftest/output/plain.pm
+++ b/source4/selftest/output/plain.pm
@@ -48,10 +48,7 @@ sub start_testsuite($$)
if ($self->{immediate}) {
print "$out\n";
} else {
- require Term::ReadKey;
- my ($wchar, $hchar, $wpixels, $hpixels) = Term::ReadKey::GetTerminalSize();
- foreach (1..$wchar) { $out.= " "; }
- print "\r".substr($out, 0, $wchar);
+ print "$out: ";
}
}
@@ -94,6 +91,13 @@ sub end_testsuite($$$$$)
$out .= $self->{test_output}->{$name};
}
+ if (not $self->{immediate}) {
+ if (not $unexpected) {
+ $out .= " ok\n";
+ } else {
+ $out .= " " . uc($result) . "\n";
+ }
+ }
print $out;
}
@@ -120,6 +124,12 @@ sub end_test($$$$$)
unless ($unexpected) {
$self->{test_output}->{$self->{NAME}} = "";
+ if (not $self->{immediate}) {
+ if ($result eq "failure") { print "f"; }
+ elsif ($result eq "skip") { print "s"; }
+ elsif ($result eq "success") { print "."; }
+ else { print "?($result)"; }
+ }
return;
}
@@ -133,6 +143,13 @@ sub end_test($$$$$)
print $self->{test_output}->{$self->{NAME}};
$self->{test_output}->{$self->{NAME}} = "";
}
+
+ if (not $self->{immediate}) {
+ if ($result eq "error") { print "E"; }
+ elsif ($result eq "failure") { print "F"; }
+ elsif ($result eq "success") { print "S"; }
+ else { print "?"; }
+ }
}
sub summary($)
--
Samba Shared Repository
More information about the samba-cvs
mailing list