Skip to content

Commit acf642e

Browse files
committed
---
yaml --- r: 82331 b: refs/heads/master c: 602b3cd h: refs/heads/master i: 82329: 3c319d6 82327: f8ac2ff v: v3
1 parent adda349 commit acf642e

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: c56bf67150ecd87b0467bd4b2bd6099c83eff65e
2+
refs/heads/master: 602b3cd56cb57782ef5772b3b737def4d9f3fd05
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
55
refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/src/libextra/test.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -640,11 +640,20 @@ pub fn run_tests_console(opts: &TestOpts,
640640
}
641641
}
642642
let st = @mut ConsoleTestState::new(opts);
643-
match tests.iter().map(|t| t.desc.name.to_str().len()).max() {
644-
Some(l) => { st.max_name_len = l; },
643+
fn len_if_padded(t: &TestDescAndFn) -> uint {
644+
match t.testfn.padding() {
645+
PadNone => 0u,
646+
PadOnLeft | PadOnRight => t.desc.name.to_str().len(),
647+
}
648+
}
649+
match tests.iter().max_by(|t|len_if_padded(*t)) {
650+
Some(t) => {
651+
let n = t.desc.name.to_str();
652+
debug2!("Setting max_name_len from: {}", n);
653+
st.max_name_len = n.len();
654+
},
645655
None => {}
646656
}
647-
debug2!("tests max_name_len: {}", st.max_name_len);
648657
run_tests(opts, tests, |x| callback(&x, st));
649658
match opts.save_metrics {
650659
None => (),

0 commit comments

Comments
 (0)