Skip to content

Commit 8f4edf9

Browse files
committed
Update test run summary
1 parent f63a7f5 commit 8f4edf9

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

src/etc/check-summary.py

+17-9
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,30 @@
77
summaries = []
88
def summarise(fname):
99
summary = {}
10-
fd = open(fname)
11-
for line in fd:
12-
status, test = line.strip().split(' ', 1)
13-
if not summary.has_key(status):
14-
summary[status] = []
15-
summary[status].append(test)
16-
summaries.append((fname, summary))
10+
with open(fname) as fd:
11+
for line in fd:
12+
splitline = line.strip().split(' ')
13+
if len(splitline) == 1:
14+
continue
15+
status = splitline[0]
16+
test = splitline[-1]
17+
# track bench runs
18+
if splitline[1] == 'ns/iter':
19+
status = 'bench'
20+
if not summary.has_key(status):
21+
summary[status] = []
22+
summary[status].append(test)
23+
summaries.append((fname, summary))
1724
def count(t):
1825
return sum(map(lambda (f, s): len(s.get(t, [])), summaries))
1926
logfiles = sys.argv[1:]
2027
map(summarise, logfiles)
2128
ok = count('ok')
2229
failed = count('failed')
2330
ignored = count('ignored')
24-
print "summary of %d test runs: %d passed; %d failed; %d ignored" % \
25-
(len(logfiles), ok, failed, ignored)
31+
measured = count('bench')
32+
print "summary of %d test runs: %d passed; %d failed; %d ignored; %d measured" % \
33+
(len(logfiles), ok, failed, ignored, measured)
2634
print ""
2735
if failed > 0:
2836
print "failed tests:"

src/libextra/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ impl<T: Writer> ConsoleTestState<T> {
474474
match self.log_out {
475475
None => (),
476476
Some(ref mut o) => {
477-
let s = format!("{} {}", match *result {
477+
let s = format!("{} {}\n", match *result {
478478
TrOk => ~"ok",
479479
TrFailed => ~"failed",
480480
TrIgnored => ~"ignored",

0 commit comments

Comments
 (0)