Skip to content

Commit 602b3cd

Browse files
committed
Only use padded test names to calculate the target padding size.
1 parent c56bf67 commit 602b3cd

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

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)