Skip to content

Commit aed033c

Browse files
committed
---
yaml --- r: 95380 b: refs/heads/dist-snap c: 602b3cd h: refs/heads/master v: v3
1 parent 47da03c commit aed033c

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
@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: c56bf67150ecd87b0467bd4b2bd6099c83eff65e
9+
refs/heads/dist-snap: 602b3cd56cb57782ef5772b3b737def4d9f3fd05
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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)